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/OvalTool.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/OvalTool.js')
-rwxr-xr-x | js/tools/OvalTool.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js index e9dc66bb..ce812398 100755 --- a/js/tools/OvalTool.js +++ b/js/tools/OvalTool.js | |||
@@ -39,8 +39,8 @@ exports.OvalTool = Montage.create(ShapeTool, { | |||
39 | 39 | ||
40 | var innerRadius = this.options.innerRadius.value / 100; | 40 | var innerRadius = this.options.innerRadius.value / 100; |
41 | 41 | ||
42 | var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor; | 42 | var strokeColor = this.options.stroke.webGlColor; |
43 | var fillColor = this.application.ninja.colorController.colorToolbar.fill.webGlColor; | 43 | var fillColor = this.options.fill.webGlColor; |
44 | 44 | ||
45 | // for default stroke and fill/no materials | 45 | // for default stroke and fill/no materials |
46 | var strokeMaterial = null; | 46 | var strokeMaterial = null; |