[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33831] trunk/blender/source/blender/ collada/MeshImporter.cpp: Fix [#25319] COLLADA import segfaults on maya model

[Nathan Letwory]

Revision: 33831
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33831
Author:   jesterking
Date:     2010-12-21 10:41:02 +0100 (Tue, 21 Dec 2010)

Log Message:
-----------
Fix [#25319] COLLADA import segfaults on maya model
Reported by Michael Williamson
Fixed by Jeroen Bakker

Wrong UV index was being used.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/MeshImporter.cpp

Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp	2010-12-21 07:35:13 UTC (rev 33830)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp	2010-12-21 09:41:02 UTC (rev 33831)
@@ -546,10 +546,8 @@
 					}
 #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