diff options
| author | Valerio Virgillito | 2012-06-01 16:17:59 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-01 16:17:59 -0700 |
| commit | 3ac4d43ccb04ee29ea0018fe3b301b2334bc6665 (patch) | |
| tree | c5be6c86ec31be0a3c42f03fb43cf6e8064e9d84 /js/tools | |
| parent | 8433fa5ed0d4cc91e10b7080aa8edb8d94ccc1a4 (diff) | |
| parent | 6db48c84047466baadfb6132cba9dbc6e0d3799c (diff) | |
| download | ninja-3ac4d43ccb04ee29ea0018fe3b301b2334bc6665.tar.gz | |
Merge pull request #8 from mqg734/dom-architecture-pentool
IKNinja-1610 and IKNinja-1647 - Can't use transform tool if you haven't used a drawing tool yet.
Diffstat (limited to 'js/tools')
| -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 | } |