[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44251] trunk/blender/source/blender/ collada/MeshImporter.cpp: Fix #30230, Crash after importing collada file

[Juha Mäki-Kanto]

Revision: 44251
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44251
Author:   kanttori
Date:     2012-02-19 17:55:09 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
Fix #30230, Crash after importing collada file

On collada import a -1 layer_index from CustomData_get_layer_index (CD_MTFACE) was used.
This then managed to overwrite last mface's data with uv-set's name so at least it gave a clue where to look for :]

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

Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp	2012-02-19 17:50:19 UTC (rev 44250)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp	2012-02-19 17:55:09 UTC (rev 44251)
@@ -746,6 +746,9 @@
 	
 	const CustomData *data = &me->fdata;
 	int layer_index = CustomData_get_layer_index(data, CD_MTFACE);
+
+	if(layer_index == -1) return NULL;
+
 	CustomDataLayer *cdl = &data->layers[layer_index+setindex];
 	
 	/* set uvname to bind_vertex_input semantic */