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

fix for OBJ exporting Texface images

Browse Source
This commit is contained in:
Campbell Barton 2010-03-02 14:57:28 +00:00
parent da3802f559
commit aec7174a42
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/io/export_obj.py
View File

@ -513,7 +513,7 @@ def write(filename, objects, scene,
# 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:

2
source/blender/python/generic/IDProp.c
View File

@ -254,7 +254,7 @@ static int idp_sequence_type(PyObject *seq)
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;