aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/line.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-19 15:56:23 -0700
committerNivesh Rajbhandari2012-06-19 15:56:23 -0700
commit3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch)
tree0ad3e94248a1d4828386c8743a670c709357a470 /js/lib/geom/line.js
parenta0d18963d746e410511c29edd32bc1775d2d5851 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
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 },