diff options
author | Jon Reid | 2012-05-22 10:40:40 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-22 10:40:40 -0700 |
commit | d43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch) | |
tree | 1c78ccc588f04bac9bff4de82e527a128162cf4f /js/tools/PenTool.js | |
parent | 1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff) | |
parent | 0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff) | |
download | ninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/tools/PenTool.js')
-rwxr-xr-x | js/tools/PenTool.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js index 16990ca7..10eb03c9 100755 --- a/js/tools/PenTool.js +++ b/js/tools/PenTool.js | |||
@@ -240,7 +240,7 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
240 | this._selectedSubpath.setStrokeWidth(strokeSize); | 240 | this._selectedSubpath.setStrokeWidth(strokeSize); |
241 | 241 | ||
242 | var colorArray=[]; | 242 | var colorArray=[]; |
243 | var color = this.application.ninja.colorController.colorToolbar.stroke.color; | 243 | var color = this.options.stroke.color; |
244 | if (color){ | 244 | if (color){ |
245 | colorArray = [color.r/255, color.g/255, color.b/255, color.a]; | 245 | colorArray = [color.r/255, color.g/255, color.b/255, color.a]; |
246 | }else { | 246 | }else { |
@@ -248,7 +248,7 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
248 | } | 248 | } |
249 | this._selectedSubpath.setStrokeColor(colorArray); | 249 | this._selectedSubpath.setStrokeColor(colorArray); |
250 | 250 | ||
251 | color = this.application.ninja.colorController.colorToolbar.fill.color; | 251 | color = this.options.fill.color; |
252 | if (color){ | 252 | if (color){ |
253 | colorArray = [color.r/255, color.g/255, color.b/255, color.a]; | 253 | colorArray = [color.r/255, color.g/255, color.b/255, color.a]; |
254 | } else { | 254 | } else { |
@@ -592,7 +592,7 @@ exports.PenTool = Montage.create(ShapeTool, { | |||
592 | var strokeColor = subpath.getStrokeColor(); | 592 | var strokeColor = subpath.getStrokeColor(); |
593 | newCanvas.elementModel.shapeModel.stroke = strokeColor; | 593 | newCanvas.elementModel.shapeModel.stroke = strokeColor; |
594 | if(strokeColor) { | 594 | if(strokeColor) { |
595 | newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke; | 595 | newCanvas.elementModel.shapeModel.border = this.options.stroke; |
596 | } | 596 | } |
597 | newCanvas.elementModel.shapeModel.GLGeomObj = subpath; | 597 | newCanvas.elementModel.shapeModel.GLGeomObj = subpath; |
598 | newCanvas.elementModel.shapeModel.useWebGl = false;//this.options.use3D; | 598 | newCanvas.elementModel.shapeModel.useWebGl = false;//this.options.use3D; |