diff options
author | Valerio Virgillito | 2012-05-16 15:40:06 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 15:40:06 -0700 |
commit | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (patch) | |
tree | 01be4d0fe4c96de8270411a32bb76378769d5b2d /js/tools/BrushTool.js | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
parent | 26c4d00b3e5d39c1c313d48433abebd06f386a85 (diff) | |
download | ninja-c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac.tar.gz |
Merge pull request #239 from mayhewinator/WorkingBranch
Tool Options styling and Icon update
Diffstat (limited to 'js/tools/BrushTool.js')
-rw-r--r-- | js/tools/BrushTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 5c334b92..0be378fd 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
@@ -132,7 +132,7 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
132 | if (this._selectedBrushStroke === null){ | 132 | if (this._selectedBrushStroke === null){ |
133 | this._selectedBrushStroke = new BrushStroke(); | 133 | this._selectedBrushStroke = new BrushStroke(); |
134 | var colorArray=[0,0,0,0]; | 134 | var colorArray=[0,0,0,0]; |
135 | var color = this.application.ninja.colorController.colorToolbar.fill.color; | 135 | var color = this.options.fill.color; |
136 | if (color){ | 136 | if (color){ |
137 | colorArray = [color.r/255, color.g/255, color.b/255, color.a]; | 137 | colorArray = [color.r/255, color.g/255, color.b/255, color.a]; |
138 | } else { | 138 | } else { |