aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/rectangle.js
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
committerJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
commit85f21e020ac281e8e545df1cf269034de99a00b1 (patch)
tree441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/geom/rectangle.js
parentd9813946dc28d8c28033a68b68300b9d9eda115c (diff)
parent11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff)
downloadninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/geom/rectangle.js')
-rwxr-xr-xjs/lib/geom/rectangle.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 81b385b3..f91e830c 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -218,7 +218,6 @@ var Rectangle = function GLRectangle() {
218 } else { 218 } else {
219 rtnStr += "flatMaterial"; 219 rtnStr += "flatMaterial";
220 } 220 }
221
222 rtnStr += "\n"; 221 rtnStr += "\n";
223 222
224 rtnStr += "fillMat: "; 223 rtnStr += "fillMat: ";
@@ -227,9 +226,10 @@ var Rectangle = function GLRectangle() {
227 } else { 226 } else {
228 rtnStr += "flatMaterial"; 227 rtnStr += "flatMaterial";
229 } 228 }
230
231 rtnStr += "\n"; 229 rtnStr += "\n";
232 230
231 rtnStr += this.exportMaterials();
232
233 return rtnStr; 233 return rtnStr;
234 }; 234 };
235 235