aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/line.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:00:34 -0700
committerArmen Kesablyan2012-06-20 15:00:34 -0700
commit38f571d1fdf02d36c3816637af7b2ca2493809da (patch)
tree69b97839be8b2b6fb65e9150d4dc02856041fb1d /js/lib/geom/line.js
parentf7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff)
parent120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff)
downloadninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz
Merge branch 'refs/heads/master' into binding
Diffstat (limited to 'js/lib/geom/line.js')
-rwxr-xr-xjs/lib/geom/line.js1
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 },