diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/tools/InkBottleTool.js | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
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 | { |