diff options
| author | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-11 17:46:29 -0700 |
| commit | b6c88f548c8d3756738e534418732710af733f03 (patch) | |
| tree | d651ce2811019a3bccfd8be1326762cd2c601316 /js/tools/InkBottleTool.js | |
| parent | 91123fef348ec54d89005adbc151e816856a6a18 (diff) | |
| parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
| download | ninja-b6c88f548c8d3756738e534418732710af733f03.tar.gz | |
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.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) |