diff options
| author | hwc487 | 2012-06-04 10:21:24 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-04 10:21:24 -0700 |
| commit | 468b20e7fbc27882f8a37c83afd86d1d06c52afd (patch) | |
| tree | 6c2a9c26429c4852961bdabba8f3dad45499be85 /js/tools/drawing-tool-base.js | |
| parent | 3f5351c5d75080727953caf5d8d9a312c1c9391b (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-468b20e7fbc27882f8a37c83afd86d1d06c52afd.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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 | } |