diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /js/tools/drawing-tool.js | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/tools/drawing-tool.js')
| -rwxr-xr-x | js/tools/drawing-tool.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js index 603f63a3..dc5f7996 100755 --- a/js/tools/drawing-tool.js +++ b/js/tools/drawing-tool.js | |||
| @@ -157,6 +157,8 @@ exports.DrawingTool = Montage.create(ToolBase, { | |||
| 157 | this.mouseUpHitRec = null; | 157 | this.mouseUpHitRec = null; |
| 158 | this.downPoint.x = null; | 158 | this.downPoint.x = null; |
| 159 | this.downPoint.y = null; | 159 | this.downPoint.y = null; |
| 160 | this.upPoint.x = null; | ||
| 161 | this.upPoint.y = null; | ||
| 160 | this._isDrawing = false; | 162 | this._isDrawing = false; |
| 161 | 163 | ||
| 162 | if (this.drawingFeedback.mode === "Draw3D") { | 164 | if (this.drawingFeedback.mode === "Draw3D") { |