diff options
| author | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
| commit | 6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch) | |
| tree | 253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/lib/geom/line.js | |
| parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 | }, |