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/RectTool.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/RectTool.js')
-rwxr-xr-x | js/tools/RectTool.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js index 0a3c8200..b35a101a 100755 --- a/js/tools/RectTool.js +++ b/js/tools/RectTool.js | |||
@@ -59,8 +59,8 @@ exports.RectTool = Montage.create(ShapeTool, { | |||
59 | var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h); | 59 | var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h); |
60 | var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h); | 60 | var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h); |
61 | 61 | ||
62 | var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor; | 62 | var strokeColor = this.options.stroke.webGlColor; |
63 | var fillColor = this.application.ninja.colorController.colorToolbar.fill.webGlColor; | 63 | var fillColor = this.options.fill.webGlColor; |
64 | // for default stroke and fill/no materials | 64 | // for default stroke and fill/no materials |
65 | var strokeMaterial = null; | 65 | var strokeMaterial = null; |
66 | var fillMaterial = null; | 66 | var fillMaterial = null; |