diff options
author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/geom/circle.js | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/geom/circle.js')
-rwxr-xr-x | js/lib/geom/circle.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js index dd82a4cc..ad77383b 100755 --- a/js/lib/geom/circle.js +++ b/js/lib/geom/circle.js | |||
@@ -577,9 +577,10 @@ var Circle = function GLCircle() { | |||
577 | } else { | 577 | } else { |
578 | rtnStr += "flatMaterial"; | 578 | rtnStr += "flatMaterial"; |
579 | } | 579 | } |
580 | |||
581 | rtnStr += "\n"; | 580 | rtnStr += "\n"; |
582 | 581 | ||
582 | rtnStr += this.exportMaterials(); | ||
583 | |||
583 | return rtnStr; | 584 | return rtnStr; |
584 | }; | 585 | }; |
585 | 586 | ||