diff options
| author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
| commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
| tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/tools/drawing-tool.js | |
| parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz | |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.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") { |