From 331ea08655245e3532e48bf160d5f68a04d8723f Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 27 Mar 2012 16:38:52 -0700
Subject: IKNINJA-764 - The Local/Global options are not in synced with both 3D
 object rotate tool and 3D object translate tool.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/tools/RotateObject3DTool.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/tools/RotateObject3DTool.js')

diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js
index 72af6eff..27352231 100755
--- a/js/tools/RotateObject3DTool.js
+++ b/js/tools/RotateObject3DTool.js
@@ -51,6 +51,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, {
                     toolHandle._rotMat = Matrix.RotationZ( angle );
                 }
             }
+            this._inLocalMode = (this.options.selectedMode === "rotateLocally");
         }
     },
 
-- 
cgit v1.2.3


From 5561e7cc43ae9f7cb9d1217ac02f9f136000e79c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 13 Apr 2012 13:37:17 -0700
Subject: fixed stage rotation

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/tools/RotateObject3DTool.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/tools/RotateObject3DTool.js')

diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js
index 27352231..902cf05d 100755
--- a/js/tools/RotateObject3DTool.js
+++ b/js/tools/RotateObject3DTool.js
@@ -18,6 +18,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, {
 
     _initializeToolHandles: {
         value: function() {
+            this.rotateStage = false;
             if(!this._handles)
             {
                 this._handles = [];
-- 
cgit v1.2.3