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/modifier-tool-base.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/modifier-tool-base.js')
| -rwxr-xr-x | js/tools/modifier-tool-base.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 6aea77aa..6c569f0a 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
| @@ -451,6 +451,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
| 451 | 451 | ||
| 452 | startDraw: { | 452 | startDraw: { |
| 453 | value: function(event) { | 453 | value: function(event) { |
| 454 | this.drawData = null; | ||
| 455 | |||
| 454 | if(this._target) | 456 | if(this._target) |
| 455 | { | 457 | { |
| 456 | this.isDrawing = true; | 458 | this.isDrawing = true; |