4 files changed, 16 insertions, 28 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 75aa308c..9e9a2241 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -627,11 +627,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         {
                 value: function ()
                 {
+            this.application.ninja.stage.clearGridCanvas();
                         if (!this.isDrawingGrid()) return;
 
                         var saveContext = this.getDrawingSurfaceElement();
                         this.setDrawingSurfaceElement(this.application.ninja.stage.gridCanvas);
-            this.clear();
 
                         // 3 coordinate axes for the plane
                         var zAxis = [this._workingPlane[0], this._workingPlane[1], this._workingPlane[2]];
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 7b4ccc17..4eecd4d5 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -140,9 +140,8 @@ exports.Layout = Montage.create(Component, {
 
             if(this.stage.appModel.show3dGrid) {
                 this.application.ninja.stage.stageDeps.snapManager.updateWorkingPlaneFromView();
-                drawUtils.drawWorkingPlane();
             }
-
+            drawUtils.drawWorkingPlane();
             drawUtils.draw3DCompass();
         }
     },
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 2469ba79..b45315b7 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -55,28 +55,6 @@ exports.StageDeps = Montage.create(Component, {
             drawUtils.snapManager = snapManager;
             drawUtils.ElementPlanes = ElementPlanes;
         }
-    },
-
-    handleOpenDocument: {
-        value: function() {
-
-            workingPlane = [0,0,1,0];
-
-            snapManager._isCacheInvalid = true;
-            snapManager.setupDragPlaneFromPlane (workingPlane);
-
-            drawUtils.initializeFromDocument();
-        }
-    },
-
-    handleSwitchDocument: {
-        value: function(){
-            workingPlane = [0,0,1,0];
-
-            snapManager._isCacheInvalid = true;
-            snapManager.setupDragPlaneFromPlane (workingPlane);
-
-            drawUtils.initializeFromDocument();
-        }
     }
+
 });
\ No newline at end of file
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index d8684739..44d6eadb 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -305,8 +305,7 @@ exports.Stage = Montage.create(Component, {
             this._scrollLeft = 0;
             this._scrollTop = 0;
 
-            this.stageDeps.handleOpenDocument();
-            this.layout.handleOpenDocument();
+            this.initialize3DOnOpenDocument();
 
             if(designView._template) {
                 var initialLeft = parseInt((this.canvas.width - designView._template.size.width)/2);
@@ -1079,6 +1078,18 @@ exports.Stage = Montage.create(Component, {
             this.application.ninja.toolsSplitter.restore();
             this.application.ninja.optionsSplitter.restore();
         }
+    },
+
+    initialize3DOnOpenDocument: {
+        value: function() {
+
+            workingPlane = [0,0,1,0];
+
+            this.snapManager._isCacheInvalid = true;
+            this.snapManager.setupDragPlaneFromPlane (workingPlane);
+
+            this.drawUtils.initializeFromDocument();
+        }
     }
 
 });
\ No newline at end of file