diff options
| author | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
| commit | 38f571d1fdf02d36c3816637af7b2ca2493809da (patch) | |
| tree | 69b97839be8b2b6fb65e9150d4dc02856041fb1d /js/lib/geom/line.js | |
| parent | f7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff) | |
| parent | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff) | |
| download | ninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz | |
Merge branch 'refs/heads/master' into binding
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 | }, |