diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-21 12:41:02 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-21 12:41:02 +0300 |
| commit | 044e31b89c37c623466e43867bd9ebaf7e26f12d (patch) | |
| tree | b8720b6488a2af15afeceeb312705ac14a13e803 /source/blender/collada/MeshImporter.cpp | |
| parent | 48cda2e08e16986d2b5eff8e183ddfc126fe4085 (diff) | |
Fix [#25319] COLLADA import segfaults on maya model
Reported by Michael Williamson
Fixed by Jeroen Bakker
Wrong UV index was being used.
Diffstat (limited to 'source/blender/collada/MeshImporter.cpp')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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 |