From 2b6f6698d294c2d586457dda6a3f460f4677c88c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 25 Sep 2008 13:17:56 +0000 Subject: [PATCH] patch [#17683] Fix OBJ import line endings from Tom Nixon (greysquare) for fixing [#17681] .OBj import issues --- release/scripts/import_obj.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/scripts/import_obj.py b/release/scripts/import_obj.py index b467cca112f..6ddfb867a36 100644 --- a/release/scripts/import_obj.py +++ b/release/scripts/import_obj.py @@ -182,7 +182,7 @@ def create_materials(filepath, material_libs, unique_materials, unique_material_ else: #print '\t\tloading mtl: "%s"' % mtlpath context_material= None - mtl= open(mtlpath) + mtl= open(mtlpath, 'rU') for line in mtl: #.xreadlines(): if line.startswith('newmtl'): context_material_name= line_value(line.split()) @@ -194,7 +194,7 @@ def create_materials(filepath, material_libs, unique_materials, unique_material_ elif context_material: # we need to make a material to assign properties to it. line_split= line.split() - line_lower= line.lower() + line_lower= line.lower().lstrip() if line_lower.startswith('ka'): context_material.setMirCol((float(line_split[1]), float(line_split[2]), float(line_split[3]))) elif line_lower.startswith('kd'): @@ -588,7 +588,7 @@ def load_obj(filepath, CLAMP_SIZE= 0.0, CREATE_FGONS= True, CREATE_SMOOTH_GROUPS print '\tpassing obj file "%s"...' % filepath, time_sub= sys.time() - file= open(filepath, 'r') + file= open(filepath, 'rU') for line in file: #.xreadlines(): if line.startswith('v '): @@ -859,7 +859,7 @@ else: os.system('find /fe/obj -iname "*.obj" > /tmp/temp3ds_list') print '...Done' - file= open('/tmp/temp3ds_list', 'r') + file= open('/tmp/temp3ds_list', 'rU') lines= file.readlines() file.close()