Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into integration-candidate

4 files changed, 14 insertions, 11 deletions

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index cf48757d..a3a30b57 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "rotate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Rotate3DTool",
-                "toolTip":      "3D Rotate Object Tool (W)",
+                "toolTip":      "3D Object Rotate Tool (W)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "translate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Translate3DTool",
-                "toolTip":      "3D Translate Object Tool (G)",
+                "toolTip":      "3D Object Translate Tool (G)",
                 "cursor":       "auto",
                 "lastInGroup":  true,
                 "container":    false,
@@ -195,7 +195,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "rotateStageProperties",
                 "spriteSheet":  true,
                 "action":       "RotateStageTool3D",
-                "toolTip":      "3D Rotate Stage Tool",
+                "toolTip":      "3D Stage Rotate Tool (M)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 443a18ac..43098cba 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -162,6 +162,13 @@ exports.KeyboardMediator = Montage.create(Component, {
                     return;
                 }
 
+                // Rotate Stage Tool is M
+                if(evt.keyCode === Keyboard.M ) {
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]});
+                    return;
+                }
+
                 // Hand tool
                 if(evt.keyCode === Keyboard.H ) {
                     evt.preventDefault();
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index aa91b2f4..b04e8b0a 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -447,16 +447,13 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 iMat;
             for(var i = 0; i < len; i++)
             {
-                // Reset to the identity matrix but retain the rotation values
+                // Reset to the identity matrix
                 item = this._targets[i];
-                elt = item.elt;
-
-                // Reset to the identity matrix but retain the translation values
                 iMat = Matrix.I(4);
                 mat = item.mat;
-                iMat[12] = mat[12];
-                iMat[13] = mat[13];
-                iMat[14] = mat[14];
+//                iMat[12] = mat[12];
+//                iMat[13] = mat[13];
+//                iMat[14] = mat[14];
 
                 dist = this._undoArray[i].dist;
 
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index cbf76830..3d9191da 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -85,7 +85,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
             {
                 // Reset to the identity matrix but retain the rotation values
                 item = this._targets[i];
-                elt = item.elt;
                 mat = item.mat.slice(0);
                 mat[12] = 0;
                 mat[13] = 0;