aboutsummaryrefslogtreecommitdiff
path: root/js/tools/LineTool.js
diff options
context:
space:
mode:
authorhwc4872012-05-03 12:57:52 -0700
committerhwc4872012-05-03 12:57:52 -0700
commite791a7a821221d206c40427fd2695b42a5bacf5f (patch)
treeac6c0f7f73c9557f2987dbd5ea081e53b5d3891b /js/tools/LineTool.js
parent571e4518d9550113d5696a61bbc07be8379ff4ac (diff)
parent595031cb9ac1dae6b8862e9bd75364b58ee0d4e5 (diff)
downloadninja-e791a7a821221d206c40427fd2695b42a5bacf5f.tar.gz
Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textures
Diffstat (limited to 'js/tools/LineTool.js')
-rwxr-xr-xjs/tools/LineTool.js2
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, {
225 { 225 {
226 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 226 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
227 } 227 }
228 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; 228 strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor;
229 } 229 }
230 230
231 var world = this.getGLWorld(canvas, this.options.use3D); 231 var world = this.getGLWorld(canvas, this.options.use3D);