Merge branch 'refs/heads/NINJAmaster' into TimelineUber

1 files changed, 16 insertions, 1 deletions

diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 8cd21a29..2e006c35 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -402,7 +402,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
             {
                 var index = this._snapIndex;
                 var pt0;
-                var useViewPoint = (this._inLocalMode && (this.application.ninja.selectedElements.length === 1));
+                var useViewPoint = this.rotateStage || (this._inLocalMode && (this.application.ninja.selectedElements.length === 1));
                 if (this._useQuadPt)
                 {
                     pt0 = this.GetQuadrantPoint(useViewPoint);
@@ -425,6 +425,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     pt1 = MathUtils.transformPoint( pt1, this._startMat );
                 }
 
+                                //console.log( "getMousePoints, useViewPoint: " + useViewPoint + ",  " + pt0 + " => " + pt1 );
                 return {pt0:pt0, pt1:pt1};
             }
             else
@@ -562,6 +563,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                     var pt = hitRec.getScreenPoint();
                     this.upPoint.x = pt[0];
                     this.upPoint.y = pt[1];
+                    this.upPoint.z = pt[2];
                                 }
                         }
         }
@@ -838,7 +840,9 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                 }
             }
 
+                        if (!this._isDrawing || (this.application.ninja.selectedElements.length == 1))
             this.DrawHandles(this._delta);
+            
             if(this._canSnap)
             {
                 snapManager.drawLastHit();
@@ -878,10 +882,21 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                 this._delta = null;
             }
             this.endDraw(event);
+
+                        this.application.ninja.stage.draw();
+                        if (this.application.ninja.selectedElements.length > 1)
+                        {
+                                //this._origin = null;
+                                this._updateHandlesOrigin();
+                        }
             this.DrawHandles();
         }
     },
 
+        _updateHandlesOrigin: {
+                value: function () { }
+        },
+
     handleToolDoubleClick: {
         value: function(event) {
             if(!this._target)