diff options
| author | hwc487 | 2012-06-12 15:52:35 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-12 15:52:35 -0700 |
| commit | 9490f816924e9e9c9970ef9384241c07ec0a6e9f (patch) | |
| tree | f44449a2e0055e21960a5513fb3a0738a91db528 /js/tools/modifier-tool-base.js | |
| parent | b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b (diff) | |
| parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
| download | ninja-9490f816924e9e9c9970ef9384241c07ec0a6e9f.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
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; |