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>

3 files changed, 11 insertions, 2 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index 5ea6f70f..d68e8a56 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -56,6 +56,7 @@ exports.ToolsList = Montage.create(Component, {
             this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties;
 
             this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
+            this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
             this.TagTool.options = this.application.ninja.toolsProperties.tagProperties;
             this.PenTool.options = this.application.ninja.toolsProperties.penProperties;
             this.TextTool.options = this.application.ninja.toolsProperties.textProperties;
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");
         }
     },
 
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 60633e74..4fac8187 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -4,15 +4,22 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Translate3DToolBase = require("js/tools/Translate3DToolBase").Translate3DToolBase,
+var Montage = require("montage/core/core").Montage,
+    Translate3DToolBase = require("js/tools/Translate3DToolBase").Translate3DToolBase,
     drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
     snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 
-exports.TranslateObject3DTool = Object.create(Translate3DToolBase, {
+exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
     _toolID: { value: "translateObject3DTool" },
     _canOperateOnStage: { value: true },
 
+    _initializeToolHandles: {
+        value: function() {
+            this._inLocalMode = (this.options.selectedMode === "rotateLocally");
+        }
+    },
+
     initializeSnapping : {
         value : function(event)
         {