diff options
author | Nivesh Rajbhandari | 2012-06-08 14:44:17 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-08 14:44:17 -0700 |
commit | 2e10e6a57f45522606c7a0e4c56962f0dc1ea225 (patch) | |
tree | 2520cbabf44d519c9136c33b51a5f5652e341126 /js/tools | |
parent | c52bf5141126801cb243ce0d4d93dbbcd29b45f6 (diff) | |
parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
download | ninja-2e10e6a57f45522606c7a0e4c56962f0dc1ea225.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ScrollBarFix
Diffstat (limited to 'js/tools')
-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 a360833a..5d983a93 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
@@ -138,7 +138,7 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
138 | } else { | 138 | } else { |
139 | colorArray = [1,1,1,0]; | 139 | colorArray = [1,1,1,0]; |
140 | } | 140 | } |
141 | this._selectedBrushStroke.setStrokeColor(colorArray); | 141 | this._selectedBrushStroke.setFillColor(colorArray); |
142 | 142 | ||
143 | //add this point to the brush stroke in case the user does a mouse up before doing a mouse move | 143 | //add this point to the brush stroke in case the user does a mouse up before doing a mouse move |
144 | var currMousePos = hitRec.calculateStageWorldPoint(); | 144 | var currMousePos = hitRec.calculateStageWorldPoint(); |