diff options
| -rw-r--r-- | release/scripts/io/export_obj.py | 2 | ||||
| -rw-r--r-- | source/blender/python/generic/IDProp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 2d039bfd45c..046ae9ecf99 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -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: diff --git a/source/blender/python/generic/IDProp.c b/source/blender/python/generic/IDProp.c index 30b3de0575b..decc28198ff 100644 --- a/source/blender/python/generic/IDProp.c +++ b/source/blender/python/generic/IDProp.c @@ -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; |