aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-03-25 08:01:11 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-03-25 08:01:11 -0500
commit126c3503a0497c437123232b9765f9efeb6e8a66 (patch)
tree739ab688dc3e5aade70b2edb79afbbb93bdacabf
parent956a87322e725e77bc8fa4435e764dd3e91711ef (diff)
parent50d123b4be4d56b9d24d5a70bc5c04ef5669eaab (diff)
downloadmediagoblin-126c3503a0497c437123232b9765f9efeb6e8a66.tar.lz
mediagoblin-126c3503a0497c437123232b9765f9efeb6e8a66.tar.xz
mediagoblin-126c3503a0497c437123232b9765f9efeb6e8a66.zip
Merge remote-tracking branch 'aeva/671_fix_stl'
-rw-r--r--mediagoblin/media_types/stl/model_loader.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/mediagoblin/media_types/stl/model_loader.py b/mediagoblin/media_types/stl/model_loader.py
index 60fa4851..88f19314 100644
--- a/mediagoblin/media_types/stl/model_loader.py
+++ b/mediagoblin/media_types/stl/model_loader.py
@@ -80,6 +80,7 @@ class ObjModel(ThreeDee):
def load(self, fileob):
for line in fileob:
+ line = line.strip()
if line[0] == "v":
self.verts.append(self.__vector(line))
@@ -121,6 +122,8 @@ def auto_detect(fileob, hint):
pass
except ValueError:
pass
+ except IndexError:
+ pass
try:
# It is pretty important that the binary stl model loader
# is tried second, because its possible for it to parse