diff options
author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/tools/modifier-tool-base.js | |
parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-x | js/tools/modifier-tool-base.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 7892d015..80f7d758 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
@@ -171,7 +171,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
171 | // } | 171 | // } |
172 | // else | 172 | // else |
173 | // { | 173 | // { |
174 | this._dragPlane = snapManager.setupDragPlanes( hitRec ); | 174 | this._dragPlane = snapManager.setupDragPlanes( hitRec, true ); |
175 | // } | 175 | // } |
176 | } | 176 | } |
177 | 177 | ||
@@ -828,14 +828,14 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
828 | this.doDraw(event); | 828 | this.doDraw(event); |
829 | } else { | 829 | } else { |
830 | this._showFeedbackOnMouseMove(event); | 830 | this._showFeedbackOnMouseMove(event); |
831 | // if(this._canSnap) | 831 | if(this._canSnap) |
832 | // { | 832 | { |
833 | // this.doSnap(event); | 833 | this.doSnap(event); |
834 | // } | 834 | } |
835 | } | 835 | } |
836 | 836 | ||
837 | this.DrawHandles(this._delta); | 837 | this.DrawHandles(this._delta); |
838 | if(this._canSnap && this._isDrawing) | 838 | if(this._canSnap) |
839 | { | 839 | { |
840 | snapManager.drawLastHit(); | 840 | snapManager.drawLastHit(); |
841 | } | 841 | } |