aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom
diff options
context:
space:
mode:
authorhwc4872012-03-12 14:59:08 -0700
committerhwc4872012-03-12 14:59:08 -0700
commit46defc9bd11bf077efd672c72787a3b67da1a178 (patch)
tree2de2441e25f91f00280ec17deaefcbceffbc37e9 /js/lib/geom
parentef2dd5dfc557154d4755914f73963da8e858c4f1 (diff)
downloadninja-46defc9bd11bf077efd672c72787a3b67da1a178.tar.gz
Uber material changes for IO
Diffstat (limited to 'js/lib/geom')
-rwxr-xr-xjs/lib/geom/geom-obj.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 1a197832..35ebadb9 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -285,9 +285,11 @@ var GeomObj = function GLGeomObj() {
285 if (mat) 285 if (mat)
286 mat.import( importStr ); 286 mat.import( importStr );
287 287
288 var endIndex = importStr.indexOf( "endMaterial\n" ); 288 // pull off the end of the material
289 var endMat = "endMaterial\n";
290 var endIndex = importStr.indexOf( endMat );
289 if (endIndex < 0) break; 291 if (endIndex < 0) break;
290 importStr = importStr.substr( endIndex ); 292 importStr = importStr.substr( endIndex + endMat.length );
291 } 293 }
292 } 294 }
293 295