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/lib/geom/line.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/lib/geom/line.js')
| -rwxr-xr-x | js/lib/geom/line.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index 3c811698..a016d7a3 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js | |||
| @@ -64,6 +64,7 @@ exports.Line = Object.create(GeomObj, { | |||
| 64 | 64 | ||
| 65 | if(strokeMaterial) { | 65 | if(strokeMaterial) { |
| 66 | this._strokeMaterial = strokeMaterial; | 66 | this._strokeMaterial = strokeMaterial; |
| 67 | if (strokeColor && this._strokeMaterial.hasProperty( "color" )) this._strokeMaterial.setProperty( "color", this._strokeColor ); | ||
| 67 | } | 68 | } |
| 68 | } | 69 | } |
| 69 | }, | 70 | }, |