diff options
| author | Valerio Virgillito | 2012-06-06 17:04:34 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-06 17:04:34 -0700 |
| commit | 6442dcc0cc4088d28558a9c121c6a91cba3ff078 (patch) | |
| tree | 8f2f2db6097104e44c8d87e11466d1f3124c7f3a /js/tools/InkBottleTool.js | |
| parent | 488ae8d98deb30009cb8b5b2da464fe52940050b (diff) | |
| parent | 47e0e1f047e83b71c3f86812a45d33904201cc7a (diff) | |
| download | ninja-6442dcc0cc4088d28558a9c121c6a91cba3ff078.tar.gz | |
Merge branch 'refs/heads/master' into element-model-fixes
Conflicts:
js/tools/LineTool.js
js/tools/ShapeTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools/InkBottleTool.js')
| -rwxr-xr-x | js/tools/InkBottleTool.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js index dff0b0fa..c5640b10 100755 --- a/js/tools/InkBottleTool.js +++ b/js/tools/InkBottleTool.js | |||
| @@ -65,6 +65,7 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, { | |||
| 65 | // Called by modifier tool base's HandleLeftButtonDown after updating selection (if needed) | 65 | // Called by modifier tool base's HandleLeftButtonDown after updating selection (if needed) |
| 66 | startDraw: { | 66 | startDraw: { |
| 67 | value: function(event) { | 67 | value: function(event) { |
| 68 | this.drawData = null; | ||
| 68 | this.isDrawing = true; | 69 | this.isDrawing = true; |
| 69 | 70 | ||
| 70 | if(this._canColor && this.application.ninja.selectedElements.length) | 71 | if(this._canColor && this.application.ninja.selectedElements.length) |