Merge branch 'refs/heads/ninja-internal' into EricMerge

Conflicts:
	js/tools/Rotate3DToolBase.js
	js/tools/RotateStage3DTool.js
	js/tools/Translate3DToolBase.js
	js/tools/modifier-tool-base.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index c0808de3..d1701304 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -7,10 +7,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Rotate3DToolBase = require("js/tools/Rotate3DToolBase").Rotate3DToolBase,
     toolHandleModule = require("js/stage/tool-handle"),
-    snapManager = require("js/helper-classes/3D/snap-manager").SnapManager,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
     vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
-    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
@@ -23,6 +21,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
 
     _initializeToolHandles: {
         value: function() {
+            this.rotateStage = true;
             if(!this._handles)
             {
                 this._handles = [];
@@ -62,7 +61,6 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
 
     _updateTargets: {
         value: function(addToUndoStack) {
-            this._targets = [];
             var elt = this._target;
 
             var curMat = viewUtils.getMatrixFromElement(elt);
@@ -76,7 +74,12 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
                         var l2gMat = viewUtils.getLocalToGlobalMatrix( elt );
                         var g2lMat = glmat4.inverse( l2gMat, [] );
                         eltCtr = MathUtils.transformAndDivideHomogeneousPoint( eltCtr, l2gMat );
-            this._targets.push({elt:elt, mat:curMat, matInv:curMatInv, ctr:eltCtr,  l2g:l2gMat,  g2l:g2lMat});
+
+            elt.elementModel.setProperty("mat", curMat);
+            elt.elementModel.setProperty("matInv", curMatInv);
+            elt.elementModel.setProperty("ctr", eltCtr);
+                        elt.elementModel.setProperty("l2g", l2gMat);
+            elt.elementModel.setProperty("g2l", g2lMat);
 
             ElementsMediator.setMatrix(elt, curMat, false, "rotateStage3DTool");
         }
@@ -85,7 +88,6 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
     captureSelectionDrawn: {
         value: function(event){
             this._origin = null;
-            this._targets = [];
             this._startOriginArray = null;
 
             var stage = this.application.ninja.currentDocument.documentRoot;
@@ -95,12 +97,12 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             var eltCtr = viewUtils.getCenterOfProjection();
             viewUtils.popViewportObj();
 
-            this._targets = [];
-
             var curMat = viewUtils.getMatrixFromElement(stage);
             var curMatInv = glmat4.inverse(curMat, []);
 
-            this._targets.push({elt:stage, mat:curMat, matInv:curMatInv, ctr:eltCtr});
+            stage.elementModel.setProperty("mat", curMat);
+            stage.elementModel.setProperty("matInv", curMatInv);
+            stage.elementModel.setProperty("ctr", eltCtr);
 
             var ctrOffset = stage.elementModel.props3D.m_transformCtr;
             if(ctrOffset)
@@ -151,6 +153,6 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
 //                      this.UpdateSelection(true);
            this.Configure(true);
        }
-   }
+    }
 
 });