diff options
| author | hwc487 | 2012-05-17 11:06:20 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-17 11:06:20 -0700 |
| commit | 0a3c703ce285941da20167a6d04b13b7eced23be (patch) | |
| tree | e87019bcc3356c58dc93d982af2cfe16b582974b /js/tools/InkBottleTool.js | |
| parent | 1e649405d66f17d6acddb9055b181bba7ad70566 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-0a3c703ce285941da20167a6d04b13b7eced23be.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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 | { |