Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 10 insertions, 2 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 96e1d6da..f6284b6c 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -96,7 +96,10 @@ exports.NJUtils = Object.create(Object.prototype, {
     ///// TODO: find a different place for this function
     makeElementModel: {
         value: function(el, selection, controller, isShape) {
-            var p3d = Montage.create(Properties3D).init(el);
+            var p3d = Montage.create(Properties3D);
+            if(selection === "Stage") {
+                p3d.init(el, true);
+            }
             var shapeProps = null;
             var pi = controller + "Pi";
 
@@ -138,7 +141,8 @@ exports.NJUtils = Object.create(Object.prototype, {
                     controller: { value: ControllerFactory.getController(controller)},
                     pi:         { value: pi},
                     props3D:    { value: p3d},
-                    shapeModel: { value: shapeProps}
+                    shapeModel: { value: shapeProps},
+                    isShape:    { value: isShape}
             });
 
         }
@@ -170,6 +174,7 @@ exports.NJUtils = Object.create(Object.prototype, {
                         // TODO - Need more info about the shape
                         selection = "canvas";
                         controller = "shape";
+                        isShape = true;
                     }
                     else
                     {
@@ -181,6 +186,9 @@ exports.NJUtils = Object.create(Object.prototype, {
                     break;
             }
             this.makeElementModel(el, selection, controller, isShape);
+            if(el.elementModel && el.elementModel.props3D) {
+                el.elementModel.props3D.init(el, (selection === "Stage"));
+            }
         }
     },