diff options
author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
tree | 796931014054ad6b0647854183f632ffd72ed9ee /js/tools/drawing-tool-base.js | |
parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/tools/drawing-tool-base.js')
-rwxr-xr-x | js/tools/drawing-tool-base.js | 2 |
1 files changed, 1 insertions, 1 deletions
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, { | |||
86 | // return null; | 86 | // return null; |
87 | // } | 87 | // } |
88 | if(downHitRec) { | 88 | if(downHitRec) { |
89 | hitRec = hitRec.convertToWorkingPlane(this.dragPlane); | 89 | hitRec = hitRec.convertToWorkingPlane(this.dragPlane || downHitRec.getPlane()); |
90 | } else if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) { | 90 | } else if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) { |
91 | hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() ); | 91 | hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() ); |
92 | } | 92 | } |