Merge pull request #346 from mqg734/MaterialsUI

UI support for preview, edit, duplicate and delete of WebGL Materials.

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, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
+                    strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
+                } else {
+                    strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
+                }
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);