From 044e31b89c37c623466e43867bd9ebaf7e26f12d Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 21 Dec 2010 09:41:02 +0000 Subject: Fix [#25319] COLLADA import segfaults on maya model Reported by Michael Williamson Fixed by Jeroen Bakker Wrong UV index was being used. --- source/blender/collada/MeshImporter.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source/blender/collada/MeshImporter.cpp') diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index ddad0903e66..0f997a616e4 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -546,10 +546,8 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) } #else for (k = 0; k < index_list_array.getCount(); k++) { - int uvset_index = index_list_array[k]->getSetIndex(); - // get mtface by face index and uv set index - MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, uvset_index); + MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k); set_face_uv(&mtface[face_index], uvs, *index_list_array[k], index, mface->v4 != 0); } #endif -- cgit v1.2.3