diff options
author | Valerio Virgillito | 2012-05-16 15:40:06 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 15:40:06 -0700 |
commit | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (patch) | |
tree | 01be4d0fe4c96de8270411a32bb76378769d5b2d /js/tools/RectTool.js | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
parent | 26c4d00b3e5d39c1c313d48433abebd06f386a85 (diff) | |
download | ninja-c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac.tar.gz |
Merge pull request #239 from mayhewinator/WorkingBranch
Tool Options styling and Icon update
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; |