diff options
author | hwc487 | 2012-05-17 08:58:52 -0700 |
---|---|---|
committer | hwc487 | 2012-05-17 08:58:52 -0700 |
commit | a73034090b30d79a0722fc5d32e081f35d2c7f5c (patch) | |
tree | 1c7a8c519a3d2e2f52df73511281918c6c70449a /js/tools/RectTool.js | |
parent | cb37bee07085690d72e69a82e76cae9166e5f0f1 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-a73034090b30d79a0722fc5d32e081f35d2c7f5c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
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; |