diff options
| author | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
| commit | 3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch) | |
| tree | 0ad3e94248a1d4828386c8743a670c709357a470 /js/tools/LineTool.js | |
| parent | a0d18963d746e410511c29edd32bc1775d2d5851 (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
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); |