diff options
author | Jose Antonio Marquez | 2012-04-10 11:24:35 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-10 11:24:35 -0700 |
commit | e663e336ee7e832b5059a82748061506b414cb04 (patch) | |
tree | a09d932319365067f437780e90aeab4ef19f74b4 /js/tools/RotateStage3DTool.js | |
parent | c3022de5ba2e24737184dba7454233b165da0a20 (diff) | |
parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
download | ninja-e663e336ee7e832b5059a82748061506b414cb04.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/tools/RotateStage3DTool.js')
-rwxr-xr-x | js/tools/RotateStage3DTool.js | 5 |
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 |