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/BrushTool.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/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 { |