From 6272ccb91038dbd029f6dcef1b5408bb05f5d169 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 16 Jun 2015 10:12:36 -0700
Subject: [PATCH] small changes
---
js/lattice/CompositeEditorLattice.js | 4 ++--
js/menus/CompositeMenu.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/js/lattice/CompositeEditorLattice.js b/js/lattice/CompositeEditorLattice.js
index ba377065..6be9c8cb 100644
--- a/js/lattice/CompositeEditorLattice.js
+++ b/js/lattice/CompositeEditorLattice.js
@@ -57,7 +57,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
this.set("color", makeRandomColor());
},
- makeNewCompositeMaterial: function(name){
+ makeNewCompositeMaterial: function(name, dimensions){
if (this.get("numCells") == 0) {
console.warn("no cells in this composite");
return;
@@ -72,7 +72,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
sparseCells: JSON.parse(JSON.stringify(this.sparseCells)),
cellsMin: this.get("cellsMin").clone(),
cellsMax: this.get("cellsMax").clone(),
- dimensions: this.calculateBoundingBox()
+ dimensions: dimensions
};
globals.materials.compositeMaterials[id] = data;//todo trigger change on all instances
},
diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js
index 3f6dd624..025eba66 100644
--- a/js/menus/CompositeMenu.js
+++ b/js/menus/CompositeMenu.js
@@ -49,7 +49,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals'], fu
this._exit();
return;
}
- lattice.compositeEditor.makeNewCompositeMaterial($("#compositeName").val());
+ lattice.compositeEditor.makeNewCompositeMaterial($("#compositeName").val(), dimensions.clone());
this._exit();
},
--
GitLab