diff options
| author | Jon Reid | 2012-05-22 10:40:40 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-22 10:40:40 -0700 |
| commit | d43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch) | |
| tree | 1c78ccc588f04bac9bff4de82e527a128162cf4f /js/tools/InkBottleTool.js | |
| parent | 1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff) | |
| parent | 0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff) | |
| download | ninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/tools/InkBottleTool.js')
| -rwxr-xr-x | js/tools/InkBottleTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js index fd17f4d6..2c03d133 100755 --- a/js/tools/InkBottleTool.js +++ b/js/tools/InkBottleTool.js | |||
| @@ -69,7 +69,7 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, { | |||
| 69 | 69 | ||
| 70 | if(this._canColor && this.application.ninja.selectedElements.length) | 70 | if(this._canColor && this.application.ninja.selectedElements.length) |
| 71 | { | 71 | { |
| 72 | var color = this.application.ninja.colorController.colorToolbar.stroke, | 72 | var color = this.options.stroke, |
| 73 | colorInfo; | 73 | colorInfo; |
| 74 | if(color && color.color) | 74 | if(color && color.color) |
| 75 | { | 75 | { |