diff --git a/js/lattice/LatticeBase.js b/js/lattice/LatticeBase.js index adff6d49b3d4ad618732154b98198850635e0ca9..06fdd267cc27a7cea38aa250f411bc433c9d111d 100644 --- a/js/lattice/LatticeBase.js +++ b/js/lattice/LatticeBase.js @@ -206,6 +206,9 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre if (material.dimensions){ var subCellMax = (new THREE.Vector3(x, y, z)).add(material.dimensions); dimVector.max(subCellMax); + } else if (cell.length){ + var subCellMax = (new THREE.Vector3(x, y, z)).add(cell.applyAbsoluteRotation(new THREE.Vector3(cell.length, 1, 1))); + dimVector.max(subCellMax); } } }); diff --git a/js/menus/MaterialEditorMenuView.js b/js/menus/MaterialEditorMenuView.js index 8ad5e68d00b628c67f60da5873fd7b5c80bb9a4c..deafc0c6b4be3f71eb4c1fb6708eaad6ec2ee5a5 100644 --- a/js/menus/MaterialEditorMenuView.js +++ b/js/menus/MaterialEditorMenuView.js @@ -21,7 +21,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'materials', 'text!materi }, _makeTemplateJSON: function(){ - return _.extend(plist, {name:"name", color:"#ffff00", altColor:"#00ffff"}); + return _.extend({name:"name", color:"#ffff00", altColor:"#00ffff"}, plist); }, template: _.template(template)