diff options
| author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
| commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
| tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/tools/LineTool.js | |
| parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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); |