2 files changed, 10 insertions, 4 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 4f1082f9..cb877591 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -94,7 +94,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;
             if(isShape) {
                 shapeProps = Montage.create(ShapeModel);
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 049145ce..c1ee0cd0 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -810,14 +810,17 @@ World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode )
         return rtnNode;
 };
 
-World.prototype.import = function( importStr ) {
+World.prototype.import = function( importStr, fromToggle ) {
         // import the worldattributes - not currently used
 
         // determine if the data was written for export (no Ninja objects)
         // or for save/restore
         //var index = importStr.indexOf( "scenedata: " );
-        var index = importStr.indexOf( "webGL: " );
-        this._useWebGL = (index >= 0)
+    // Skip if we are toggling between canvas2d and WebGL since importStr doesn't have the correct webGL value yet
+    if(!fromToggle) {
+        var index = importStr.indexOf( "webGL: " );
+        this._useWebGL = (index >= 0)
+    }
         if (this._useWebGL)
         {
                 // start RDGE