Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textures

1 files changed, 1 insertions, 1 deletions

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