[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27218] trunk/blender: fix for OBJ exporting Texface images

[Campbell Barton]

Revision: 27218
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27218
Author:   campbellbarton
Date:     2010-03-02 15:57:28 +0100 (Tue, 02 Mar 2010)

Log Message:
-----------
fix for OBJ exporting Texface images

Modified Paths:
--------------
    trunk/blender/release/scripts/io/export_obj.py
    trunk/blender/source/blender/python/generic/IDProp.c

Modified: trunk/blender/release/scripts/io/export_obj.py
===================================================================
--- trunk/blender/release/scripts/io/export_obj.py	2010-03-02 11:48:40 UTC (rev 27217)
+++ trunk/blender/release/scripts/io/export_obj.py	2010-03-02 14:57:28 UTC (rev 27218)
@@ -513,7 +513,7 @@
                 # XXX update
                 tface = me.active_uv_texture.data
 
-                face_index_pairs.sort(key=lambda a: (a[0].material_index, tface[a[1]].image, a[0].smooth))
+                face_index_pairs.sort(key=lambda a: (a[0].material_index, hash(tface[a[1]].image), a[0].smooth))
             elif len(materials) > 1:
                 face_index_pairs.sort(key = lambda a: (a[0].material_index, a[0].smooth))
             else:

Modified: trunk/blender/source/blender/python/generic/IDProp.c
===================================================================
--- trunk/blender/source/blender/python/generic/IDProp.c	2010-03-02 11:48:40 UTC (rev 27217)
+++ trunk/blender/source/blender/python/generic/IDProp.c	2010-03-02 14:57:28 UTC (rev 27218)
@@ -254,7 +254,7 @@
 				return -1;
 			}
 		}
-		else if (PyMapping_Check(item)) { /*do nothing */
+		else if (PyMapping_Check(item)) {
 			if(i != 0 && (type != IDP_IDPARRAY)) { /* mixed dict/int */
 				Py_DECREF(item);
 				return -1;