6 files changed, 42 insertions, 13 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index e0bff70c..749a1dd9 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -19,43 +19,51 @@ exports.ShapesController = Montage.create(CanvasController, {
                     this.setShapeProperty(el, "strokeSize", value);
                     el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "innerRadius":
                     this.setShapeProperty(el, "innerRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "tlRadius":
                     this.setShapeProperty(el, "tlRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setTLRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "trRadius":
                     this.setShapeProperty(el, "trRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setTRRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "blRadius":
                     this.setShapeProperty(el, "blRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setBLRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "brRadius":
                     this.setShapeProperty(el, "brRadius", value);
                     el.elementModel.shapeModel.GLGeomObj.setBRRadius(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "width":
                     el.elementModel.shapeModel.GLGeomObj.setWidth(val);
                     CanvasController.setProperty(el, p, value);
                     el.elementModel.shapeModel.GLWorld.setViewportFromCanvas(el);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "height":
                     el.elementModel.shapeModel.GLGeomObj.setHeight(val);
                     CanvasController.setProperty(el, p, value);
                     el.elementModel.shapeModel.GLWorld.setViewportFromCanvas(el);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "useWebGl":
                     var canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
@@ -76,6 +84,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                         el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm);
                         el.elementModel.shapeModel.strokeMaterial = sm;
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                        el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 case "fillMaterial":
@@ -85,12 +94,12 @@ exports.ShapesController = Montage.create(CanvasController, {
                         el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
                         el.elementModel.shapeModel.fillMaterial = fm;
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                        el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 default:
                     CanvasController.setProperty(el, p, value);
             }
-            el.elementModel.shapeModel.GLWorld.render();
         }
     },
 
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/SelectionTool.js b/js/tools/SelectionTool.js
index 37029e8c..caa9e8d6 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -305,16 +305,33 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                     newHeight.push(_h + "px");
 
                     viewUtils.setMatrixForElement(elt, previousMat);
+
+                    this._targets[i].mat = previousMat;
+                    this._targets[i].matInv = glmat4.inverse(previousMat, []);
                 }
             }
             if(addToUndoStack)
             {
-                ElementsMediator.setProperties(this.application.ninja.selectedElements,
+                // if we have a delta, that means the transform handles were used and
+                // we should update the width and height too.  Otherwise, just update left and top.
+                if(this._delta)
+                {
+                    ElementsMediator.setProperties(this.application.ninja.selectedElements,
                                                 { "left": newLeft, "top": newTop, "width": newWidth, "height": newHeight },
                                                 "Change",
                                                 "selectionTool",