aboutsummaryrefslogtreecommitdiff
path: root/js/tools/RotateStage3DTool.js
diff options
context:
space:
mode:
authorJon Reid2012-04-10 14:52:23 -0700
committerJon Reid2012-04-10 14:52:23 -0700
commitc19987997758cf47ac9b93a2a767a0e2a9072745 (patch)
treeeb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/tools/RotateStage3DTool.js
parent03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff)
parent422b14fc60be84c116115f2e71e3499e232f3f05 (diff)
downloadninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/tools/RotateStage3DTool.js')
-rwxr-xr-xjs/tools/RotateStage3DTool.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 2b312e53..f5cc4040 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -76,7 +76,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
76 76
77 this._targets.push({elt:elt, mat:curMat, matInv:curMatInv, ctr:eltCtr}); 77 this._targets.push({elt:elt, mat:curMat, matInv:curMatInv, ctr:eltCtr});
78 78
79 viewUtils.setMatrixForElement( elt, curMat, false ); 79 ElementsMediator.setMatrix(elt, curMat, false, "rotateStage3DTool");
80 } 80 }
81 }, 81 },
82 82
@@ -130,7 +130,8 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
130 // Reset stage to identity matrix 130 // Reset stage to identity matrix
131 var iMat = Matrix.I(4); 131 var iMat = Matrix.I(4);
132 132
133 ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot, iMat, false); 133 ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot,
134 iMat, false, "rotateStage3DTool");
134 this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null; 135 this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null;
135 136
136 // let the document and stage manager know about the zoom change 137 // let the document and stage manager know about the zoom change