aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-15 06:28:14 -0700
committerJose Antonio Marquez Russo2012-03-15 06:28:14 -0700
commit67748b4fb19cd5fd210ca711c98d992371c4d2d3 (patch)
treeab86675822de48f16be1000e8c137ec7189fc3e4 /js/lib/geom
parent089534a80c64226bf7d124ab9147afce386fdb5c (diff)
parent57d4a82977a1f0e809511fe894886f88581d9615 (diff)
downloadninja-67748b4fb19cd5fd210ca711c98d992371c4d2d3.tar.gz
Merge pull request #34 from ericmueller/integration
Integration
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 f285f24a..a64980e0 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -325,9 +325,11 @@ var GeomObj = function GLGeomObj() {
325 if (mat) 325 if (mat)
326 mat.import( importStr ); 326 mat.import( importStr );
327 327
328 var endIndex = importStr.indexOf( "endMaterial\n" ); 328 // pull off the end of the material
329 var endMat = "endMaterial\n";
330 var endIndex = importStr.indexOf( endMat );
329 if (endIndex < 0) break; 331 if (endIndex < 0) break;
330 importStr = importStr.substr( endIndex ); 332 importStr = importStr.substr( endIndex + endMat.length );
331 } 333 }
332 } 334 }
333 335