Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II

Conflicts:
	js/helper-classes/3D/view-utils.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js
	js/tools/Translate3DToolBase.js

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, {
 
             this._targets.push({elt:elt, mat:curMat, matInv:curMatInv, ctr:eltCtr});
 
-            viewUtils.setMatrixForElement( elt, curMat, false );
+            ElementsMediator.setMatrix(elt, curMat, false, "rotateStage3DTool");
         }
     },
 
@@ -130,7 +130,8 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
            // Reset stage to identity matrix
            var iMat = Matrix.I(4);
 
-           ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot, iMat, false);
+           ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot,
+                                        iMat, false, "rotateStage3DTool");
            this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null;
 
                         // let the document and stage manager know about the zoom change