diff options
author | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 12:15:26 -0700 |
commit | 1839f24e8dcbad38d1381bbcd65c17a9caa45987 (patch) | |
tree | 516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /js/tools/LineTool.js | |
parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
parent | febfdb18042d1c73ac58ee4e35c5f176428dee00 (diff) | |
download | ninja-1839f24e8dcbad38d1381bbcd65c17a9caa45987.tar.gz |
Merge pull request #346 from mqg734/MaterialsUI
UI support for preview, edit, duplicate and delete of WebGL Materials.
Diffstat (limited to 'js/tools/LineTool.js')
-rwxr-xr-x | js/tools/LineTool.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 89f33a16..d2ee0b43 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -268,7 +268,11 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
268 | { | 268 | { |
269 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); | 269 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); |
270 | } | 270 | } |
271 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; | 271 | if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) { |
272 | strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops}; | ||
273 | } else { | ||
274 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; | ||
275 | } | ||
272 | } | 276 | } |
273 | 277 | ||
274 | var world = this.getGLWorld(canvas, this.options.use3D); | 278 | var world = this.getGLWorld(canvas, this.options.use3D); |