diff options
| author | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-05-16 16:23:05 -0700 |
| commit | d59cb51c275fbbef84604f9ed77afedba8168099 (patch) | |
| tree | 7d3f51c20eb6b6940c1ce648d828fa1e2d8d510b /js/tools/OvalTool.js | |
| parent | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (diff) | |
| parent | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (diff) | |
| download | ninja-d59cb51c275fbbef84604f9ed77afedba8168099.tar.gz | |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
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; |