From eacb9c4886c0ef29885bbb68dc6b9580084beb59 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Sun, 24 Mar 2013 16:12:55 -0500 Subject: [PATCH 1/2] Fixed a bug that had binary stls be handled by the ascii stl parser. --- mediagoblin/media_types/stl/model_loader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mediagoblin/media_types/stl/model_loader.py b/mediagoblin/media_types/stl/model_loader.py index 60fa4851..528c82fa 100644 --- a/mediagoblin/media_types/stl/model_loader.py +++ b/mediagoblin/media_types/stl/model_loader.py @@ -121,6 +121,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 From 50d123b4be4d56b9d24d5a70bc5c04ef5669eaab Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Mon, 25 Mar 2013 07:55:24 -0500 Subject: [PATCH 2/2] Ascii stl files now should have their whitespace stripped when parsing. --- mediagoblin/media_types/stl/model_loader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mediagoblin/media_types/stl/model_loader.py b/mediagoblin/media_types/stl/model_loader.py index 528c82fa..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))