Fixing merge issues

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 6621d18b..d5bfa38a 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -226,7 +226,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 {
                     strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
                 }
-                strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor;
+                                strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);