diff options
author | Valerio Virgillito | 2012-06-11 14:10:08 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-11 14:10:08 -0700 |
commit | f4ad120c1a0d8594b8741eb1b07fdbd4fefcadeb (patch) | |
tree | 5dff803d67722595418e69f6cce9ec8a1a616f2f /js/tools | |
parent | 30f17ae934ee60ed6e4ce52fad1eebc35fc5914a (diff) | |
parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
download | ninja-f4ad120c1a0d8594b8741eb1b07fdbd4fefcadeb.tar.gz |
Merge branch 'refs/heads/master' into dom-container
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(); |