diff options
| author | Armen Kesablyan | 2012-06-20 15:00:19 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:00:19 -0700 |
| commit | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (patch) | |
| tree | 8c07b1203de42f6efdeebfc8663072fffb4a567b /js/lib/geom/line.js | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| parent | 52833c3d8a485944c42acc6ac0ae5139b3427da8 (diff) | |
| download | ninja-120e31dcf1e11eed11ee430d77c438e7b073e9f8.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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 | }, |