aboutsummaryrefslogtreecommitdiff
path: root/js/tools/modifier-tool-base.js
diff options
context:
space:
mode:
authorhwc4872012-03-16 12:40:50 -0700
committerhwc4872012-03-16 12:40:50 -0700
commit2ac5db3bb1bcee887d6dd742e6c0273abb5366bd (patch)
tree13622390967922f9c1719bf835f2f818867b5b9b /js/tools/modifier-tool-base.js
parenta0d23354802ebc6b437698acb4b18d3395d47cd1 (diff)
parent3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff)
downloadninja-2ac5db3bb1bcee887d6dd742e6c0273abb5366bd.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-xjs/tools/modifier-tool-base.js12
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 }