Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

3 files changed, 12 insertions, 2 deletions

diff --git a/js/tools/PanTool.js b/js/tools/PanTool.js
index 39f89d17..a8911c0c 100755
--- a/js/tools/PanTool.js
+++ b/js/tools/PanTool.js
@@ -122,7 +122,6 @@ exports.PanTool = Montage.create(toolBase,
         value: function ()
                 {
                         var uc = this.application.ninja.currentDocument.model.documentRoot;
-                        //var uc = documentManagerModule.DocumentManager.activeDocument
                         var ucMat = viewUtils.getMatrixFromElement(uc);
 
                         var noTrans = ucMat.slice();
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 12b21a64..9e117837 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -85,6 +85,12 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
         }
     },
 
+    captureSelectionChange: {
+        value: function(event){
+            this.eventManager.addEventListener("selectionDrawn", this, true);
+        }
+    },
+
     captureSelectionDrawn: {
         value: function(event){
             this._origin = null;
@@ -114,6 +120,11 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             this._origin = viewUtils.localToGlobal(eltCtr, stage);
             this._setTransformOrigin(false);
             this.DrawHandles();
+
+            if(event)
+            {
+                this.eventManager.removeEventListener("selectionDrawn", this, true);
+            }
         }
     },
 
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 3549de1c..a752ad65 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -86,7 +86,7 @@ exports.DrawingToolBase = Montage.create(Component, {
 //                    return null;
 //                }
                 if(downHitRec) {
-                    hitRec = hitRec.convertToWorkingPlane(this.dragPlane);
+                    hitRec = hitRec.convertToWorkingPlane(this.dragPlane || downHitRec.getPlane());
                 } else if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
                     hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
                 }