eod

js/cells/supercells/DMASuperCell.js

@@ -30,14 +30,14 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'],
                 for (var z=0;z<range.z;z++){
                     //child cells add themselves to object3D
                     if (material.cells && material.cells[x][y][z]) cells[x][y].push(this._makeSubCellForIndex(new THREE.Vector3(x, y, z), this, material.cells[x][y][z].material));
-                    else cells[x][y].push(this._makeSubCellForIndex(new THREE.Vector3(x, y, z), this, material));
+                    else cells[x][y].push(this._makeSubCellForIndex({index: new THREE.Vector3(x, y, z), material:this.material}));
                 }
             }
         }
         return cells;
     };
 
-    DMASuperCell.prototype._makeSubCellForIndex = function(index, supercell, material){
+    DMASuperCell.prototype._makeSubCellForIndex = function(json){
         return null;//override in subclasses
     };
 

js/cells/supercells/GIKSuperCell.js

@@ -21,8 +21,8 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'superCell',
     };
     GIKSuperCell.prototype = Object.create(DMASuperCell.prototype);
 
-    GIKSuperCell.prototype._makeSubCellForIndex = function(index, material){
-        return new GIKCell(index, material, this);
+    GIKSuperCell.prototype._makeSubCellForIndex = function(json){
+        return new GIKCell(json, this);
     };
 
     GIKSuperCell.prototype._rotateCell = function(object3D){

js/menus/CompositeMenu.js

@@ -105,7 +105,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals'], fu
                 <span><%= materials.compositeMaterials[key].name %></span></div>\
             </label>\
             <% }); %><br/>\
-            <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>\
+            <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Save Composite</a><br/>\
             <a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>\
             <a id="deleteComposite" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default"><span class="fui-trash"></span> Delete</a><br/>\
             ')