Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

Conflicts:
	js/stage/stage.reel/stage.js

2 files changed, 17 insertions, 9 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 625c09ad..89fa44f3 100644
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -112,6 +112,7 @@ exports.Layout = Montage.create(Component, {
             }
 
             this.draw(); // Not a reel yet :)
+            this.draw3DInfo(false);
 
 
         }
@@ -128,9 +129,16 @@ exports.Layout = Montage.create(Component, {
     },
 
     draw3DInfo: {
-        value: function() {
-            drawUtils.updatePlanes();
-            if(this.stage.appModel.show3dGrid) drawUtils.drawWorkingPlane();
+        value: function(updatePlanes) {
+            if(updatePlanes)
+            {
+                drawUtils.updatePlanes();
+            }
+            if(this.stage.appModel.show3dGrid)
+            {
+                this.application.ninja.stage.stageDeps.snapManager.updateWorkingPlaneFromView();
+                drawUtils.drawWorkingPlane();
+            }
             drawUtils.draw3DCompass();
         }
     },
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 92ab4033..b72615db 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -175,7 +175,7 @@ exports.Stage = Montage.create(Component, {
             }
             else if(this.updatedStage) {
                 this.layout.draw();
-                this.layout.draw3DInfo();
+                this.layout.draw3DInfo(true);
             }
         }
     },
@@ -839,8 +839,8 @@ exports.Stage = Montage.create(Component, {
     setStageView: {
         value: function(side) {
             var mat,
-                workingPlane = null,
-                currentDoc = this.application.ninja.currentDocument.documentRoot;
+                currentDoc = this.application.ninja.currentDocument.documentRoot,
+                isDrawingGrid = this.application.ninja.appModel.show3dGrid;
             // Stage 3d Props.
             currentDoc.elementModel.props3D.ResetTranslationValues();
             currentDoc.elementModel.props3D.ResetRotationValues();
@@ -850,19 +850,19 @@ exports.Stage = Montage.create(Component, {
                 case "top":
                     mat = Matrix.RotationX(Math.PI * 270.0/180.0);
                     drawUtils.drawXY = drawUtils.drawYZ = false;
-                    drawUtils.drawXZ = drawUtils.isDrawingGrid();
+                    drawUtils.drawXZ = isDrawingGrid;
                     break;
 
                 case "side":
                     mat = Matrix.RotationY(Math.PI * 270/180);
                     drawUtils.drawXY = drawUtils.drawXZ = false;
-                    drawUtils.drawYZ = drawUtils.isDrawingGrid();
+                    drawUtils.drawYZ = isDrawingGrid;
                     break;
 
                 case "front":
                     mat = Matrix.I(4);
                     drawUtils.drawYZ = drawUtils.drawXZ = false;
-                    drawUtils.drawXY = drawUtils.isDrawingGrid();
+                    drawUtils.drawXY = isDrawingGrid;
                     break;
             }
                         workingPlane = this.getPlaneForView( side );