aboutsummaryrefslogtreecommitdiff
path: root/js/tools/BrushTool.js
diff options
context:
space:
mode:
authorhwc4872012-05-17 08:58:52 -0700
committerhwc4872012-05-17 08:58:52 -0700
commita73034090b30d79a0722fc5d32e081f35d2c7f5c (patch)
tree1c7a8c519a3d2e2f52df73511281918c6c70449a /js/tools/BrushTool.js
parentcb37bee07085690d72e69a82e76cae9166e5f0f1 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-a73034090b30d79a0722fc5d32e081f35d2c7f5c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Diffstat (limited to 'js/tools/BrushTool.js')
-rw-r--r--js/tools/BrushTool.js2
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 {