소스 검색

Merge pull request #4984 from okready/patch-2

Support OBJ and MTL files that may contain tags split onto multiple line...
Mr.doob 11 년 전
부모
커밋
895d39e3ee
1개의 변경된 파일14개의 추가작업 그리고 0개의 파일을 삭제
  1. 14 0
      utils/converters/obj/convert_obj_three.py

+ 14 - 0
utils/converters/obj/convert_obj_three.py

@@ -362,7 +362,14 @@ def parse_mtl(fname):
 
     materials = {}
 
+    previous_line = ""
     for line in fileinput.input(fname):
+        line = previous_line + line
+        if line[-2:-1] == '\\':
+            previous_line = line[:-2]
+            continue
+        previous_line = ""
+
         chunks = line.split()
         if len(chunks) > 0:
 
@@ -505,7 +512,14 @@ def parse_obj(fname):
     object = 0
     smooth = 0
 
+    previous_line = ""
     for line in fileinput.input(fname):
+        line = previous_line + line
+        if line[-2:-1] == '\\':
+            previous_line = line[:-2]
+            continue
+        previous_line = ""
+
         chunks = line.split()
         if len(chunks) > 0: