diff options
| author | Eric Guzman | 2012-06-20 19:42:03 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-20 19:42:03 -0700 |
| commit | 3270aac4980c908f305fb53abadda5121ff6b9cb (patch) | |
| tree | 6255aaab239fde71b1f4862dd70de7be62f48b85 /js/tools/LineTool.js | |
| parent | a5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff) | |
| parent | 87377c81da06abf6d656017859830a3ab2902f0e (diff) | |
| download | ninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/tools/LineTool.js')
| -rwxr-xr-x | js/tools/LineTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 40475908..07429bc0 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
| @@ -237,7 +237,7 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
| 237 | { | 237 | { |
| 238 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); | 238 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); |
| 239 | } | 239 | } |
| 240 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; | 240 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | var world = this.getGLWorld(canvas, this.options.use3D); | 243 | var world = this.getGLWorld(canvas, this.options.use3D); |