2 files changed, 8 insertions, 5 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index b3ac9ddb..9b0159d4 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -495,7 +495,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 world = new World(el, true);
                 el.elementModel.shapeModel.GLWorld = world;
                 el.elementModel.shapeModel.useWebGl = true;
-                world.import(worldData);
+                world.import(worldData, true);
                 el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
 
                 sm = Object.create(MaterialsModel.getMaterial("FlatMaterial"));
@@ -531,7 +531,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 world = new World(el, false);
                 el.elementModel.shapeModel.GLWorld = world;
                 el.elementModel.shapeModel.useWebGl = false;
-                world.import(worldData);
+                world.import(worldData, true);
                 el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
                 el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(null);
                 el.elementModel.shapeModel.strokeMaterial = null;
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