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/LineTool.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/LineTool.js')
-rwxr-xr-x | js/tools/LineTool.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 198d7e69..b2b48383 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -44,8 +44,8 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
44 | } | 44 | } |
45 | 45 | ||
46 | this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null); | 46 | this._strokeSize = ShapesController.GetValueInPixels(this.options.strokeSize.value, this.options.strokeSize.units, null); |
47 | if (this.application.ninja.colorController.colorToolbar.stroke.color) | 47 | if (this.options.stroke.color) |
48 | this._strokeColor = this.application.ninja.colorController.colorToolbar.stroke.color.css; | 48 | this._strokeColor = this.options.stroke.color.css; |
49 | else | 49 | else |
50 | this._strokeColor = [0,0,0,1]; | 50 | this._strokeColor = [0,0,0,1]; |
51 | this.startDraw(event); | 51 | this.startDraw(event); |
@@ -215,7 +215,7 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
215 | var left = Math.round(midPt[0] - 0.5*w); | 215 | var left = Math.round(midPt[0] - 0.5*w); |
216 | var top = Math.round(midPt[1] - 0.5*h); | 216 | var top = Math.round(midPt[1] - 0.5*h); |
217 | 217 | ||
218 | var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor; | 218 | var strokeColor = this.options.stroke.webGlColor; |
219 | // for default stroke and fill/no materials | 219 | // for default stroke and fill/no materials |
220 | var strokeMaterial = null; | 220 | var strokeMaterial = null; |
221 | 221 | ||