aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-01-30 14:21:59 -0800
committerNivesh Rajbhandari2012-01-30 14:21:59 -0800
commit8b8b9bc1cd033b483f3a5c57acc75dfb56e099a4 (patch)
tree387ce950c27768b253bfb3d9e05195ac34565b0a /js/stage
parent51b4e61d6c6df5e88e9a5dfcdfd7944e2a3f64e7 (diff)
downloadninja-8b8b9bc1cd033b483f3a5c57acc75dfb56e099a4.tar.gz
Fixed grid not drawing bug when switching from front to top and side.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/stage')
-rw-r--r--js/stage/stage.reel/stage.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 31d0f8c2..8c4efd58 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -814,8 +814,8 @@ exports.Stage = Montage.create(Component, {
814 setStageView: { 814 setStageView: {
815 value: function(side) { 815 value: function(side) {
816 var mat, 816 var mat,
817 workingPlane = null, 817 currentDoc = this.application.ninja.currentDocument.documentRoot,
818 currentDoc = this.application.ninja.currentDocument.documentRoot; 818 isDrawingGrid = this.application.ninja.appModel.show3dGrid;
819 // Stage 3d Props. 819 // Stage 3d Props.
820 currentDoc.elementModel.props3D.ResetTranslationValues(); 820 currentDoc.elementModel.props3D.ResetTranslationValues();
821 currentDoc.elementModel.props3D.ResetRotationValues(); 821 currentDoc.elementModel.props3D.ResetRotationValues();
@@ -826,7 +826,7 @@ exports.Stage = Montage.create(Component, {
826 mat = Matrix.RotationX(Math.PI * 270.0/180.0); 826 mat = Matrix.RotationX(Math.PI * 270.0/180.0);
827 827
828 drawUtils.drawXY = drawUtils.drawYZ = false; 828 drawUtils.drawXY = drawUtils.drawYZ = false;
829 drawUtils.drawXZ = drawUtils.isDrawingGrid(); 829 drawUtils.drawXZ = isDrawingGrid;
830 workingPlane = [0,1,0,0]; 830 workingPlane = [0,1,0,0];
831 break; 831 break;
832 832
@@ -834,7 +834,7 @@ exports.Stage = Montage.create(Component, {
834 mat = Matrix.RotationY(Math.PI * 270/180); 834 mat = Matrix.RotationY(Math.PI * 270/180);
835 835
836 drawUtils.drawXY = drawUtils.drawXZ = false; 836 drawUtils.drawXY = drawUtils.drawXZ = false;
837 drawUtils.drawYZ = drawUtils.isDrawingGrid(); 837 drawUtils.drawYZ = isDrawingGrid;
838 workingPlane = [1,0,0,0]; 838 workingPlane = [1,0,0,0];
839 break; 839 break;
840 840
@@ -842,7 +842,7 @@ exports.Stage = Montage.create(Component, {
842 mat = Matrix.I(4); 842 mat = Matrix.I(4);
843 843
844 drawUtils.drawYZ = drawUtils.drawXZ = false; 844 drawUtils.drawYZ = drawUtils.drawXZ = false;
845 drawUtils.drawXY = drawUtils.isDrawingGrid(); 845 drawUtils.drawXY = isDrawingGrid;
846 workingPlane = [0,0,1,0]; 846 workingPlane = [0,0,1,0];
847 break; 847 break;
848 } 848 }