diff options
| author | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
| commit | 7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch) | |
| tree | f0f6168b083aa929d34f37edca6c87ce7c3743bd /js/tools/OvalTool.js | |
| parent | 0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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; |