diff options
| author | Ananya Sen | 2012-06-08 17:09:55 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-08 17:09:55 -0700 |
| commit | 19d9da2ae655f0b531aa0e348a15bcf9d673a776 (patch) | |
| tree | 4ec453ac47c77b9d5872e0b78a1b17971a95ce3d /js/tools | |
| parent | 113ed223e9848d9838e574c67720d524653e704c (diff) | |
| parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
| download | ninja-19d9da2ae655f0b531aa0e348a15bcf9d673a776.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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(); |