revert 31916, while having the image name and the material name mixed, this is intent...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Sep 2010 01:10:20 +0000 (01:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Sep 2010 01:10:20 +0000 (01:10 +0000)
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

release/scripts/op/io_scene_obj/export_obj.py

index c1969da9d53c3b2bb8673ec524802da357ff5617..01f5b221546c2bd1d3e84ee1ce1fdad992902333 100644 (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.
-                            mat_data = mtl_dict[key] = ('%s'%fixName(key[0])), materialItems[f_mat], f_image
+                            # 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)