diff options
| author | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
| commit | 483ad57efcd6475776f580c3af5b60e6deeaf781 (patch) | |
| tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /js/tools/LineTool.js | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| parent | c65c532d081afd73e4a325abe4ab97c6726c02db (diff) | |
| download | ninja-483ad57efcd6475776f580c3af5b60e6deeaf781.tar.gz | |
Merge pull request #298 from ericmueller/Textures
Textures
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); |