kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

revert 31916, while having the image name and the material name mixed, this is intentional else texface export breaks.

Browse Source 
ideally this would only happen in cases where there are more then 1 image so we could avoid ugly names in common cases.
  svn merge -r31916:31915  release/scripts/op/io_scene_obj/export_obj.py
This commit is contained in:
Campbell Barton 2010-09-14 01:10:20 +00:00
parent a02e69064d
commit 1a58c6af7e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/scripts/op/io_scene_obj/export_obj.py
View File

@ -634,8 +634,14 @@ def write_file(filepath, objects, scene,
# First add to global dict so we can export to mtl
# Then write mtl
# convert any spaces to underscores with fixName.
# Make a new names from the mat and image name,
# converting any spaces to underscores with fixName.
# If none image dont bother adding it to the name
if key[1] == None:
mat_data = mtl_dict[key] = ('%s'%fixName(key[0])), materialItems[f_mat], f_image
else:
mat_data = mtl_dict[key] = ('%s_%s' % (fixName(key[0]), fixName(key[1]))), materialItems[f_mat], f_image
if EXPORT_GROUP_BY_MAT:
file.write('g %s_%s_%s\n' % (fixName(ob.name), fixName(ob.data.name), mat_data[0]) ) # can be mat_image or (null)