[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31917] trunk/blender/release/scripts/op/ io_scene_obj/export_obj.py: revert 31916, while having the image name and the material name mixed, this is intentional else texface export breaks.

[Campbell Barton]

Revision: 31917
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31917
Author:   campbellbarton
Date:     2010-09-14 03:10:20 +0200 (Tue, 14 Sep 2010)

Log Message:
-----------
revert 31916, while having the image name and the material name mixed, this is intentional else texface export breaks.
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

Modified Paths:
--------------
    trunk/blender/release/scripts/op/io_scene_obj/export_obj.py

Modified: trunk/blender/release/scripts/op/io_scene_obj/export_obj.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_obj/export_obj.py	2010-09-14 00:45:37 UTC (rev 31916)
+++ trunk/blender/release/scripts/op/io_scene_obj/export_obj.py	2010-09-14 01:10:20 UTC (rev 31917)
@@ -634,9 +634,15 @@
                             # 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)