[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21915] branches/soc-2009-chingachgook/ source/blender/collada/DocumentImporter.cpp: Another small fix.

[Chingiz Dyussenov]

Revision: 21915
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21915
Author:   chingachgook
Date:     2009-07-26 09:45:11 +0200 (Sun, 26 Jul 2009)

Log Message:
-----------
Another small fix.

Modified Paths:
--------------
    branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp

Modified: branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp	2009-07-26 04:31:46 UTC (rev 21914)
+++ branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp	2009-07-26 07:45:11 UTC (rev 21915)
@@ -145,13 +145,13 @@
 	std::map<COLLADAFW::UniqueId, Lamp*> uid_lamp_map;
 	std::map<COLLADAFW::UniqueId, COLLADAFW::UniqueId> skinid_meshid_map;
 	// maps for assigning textures to uv layers
-	std::map<COLLADAFW::TextureMapId, char*> set_layername_map;
+	//std::map<COLLADAFW::TextureMapId, char*> set_layername_map;
 	std::map<COLLADAFW::TextureMapId, std::vector<MTex*> > index_mtex_map;
 	// this structure is used to assign material indices to faces
 	// when materials are assigned to an object
 	struct Primitive {
 		MFace *mface;
-		int totface;
+		unsigned int totface;
 	};
 	typedef std::map<COLLADAFW::MaterialId, std::vector<Primitive> > MaterialIdPrimitiveArrayMap;
 	// amazing name!
@@ -343,9 +343,9 @@
 				return NULL;
 			}
 		}
-
+		if (!uid_mesh_map[*geom_uid])
+			return NULL;
 		set_mesh(ob, uid_mesh_map[*geom_uid]);
-
 		
 		if (old_mesh->id.us == 0) free_libblock(&G.main->mesh, old_mesh);
 		
@@ -356,7 +356,7 @@
 		bool first_time = true;
 		
 		// assign material indices to mesh faces
-		for (int k = 0; k < geom->getMaterialBindings().getCount(); k++) {
+		for (unsigned int k = 0; k < geom->getMaterialBindings().getCount(); k++) {
 			
 			const COLLADAFW::UniqueId& ma_uid = geom->getMaterialBindings()[k].getReferencedMaterial();
 			// check if material was properly written to map
@@ -365,7 +365,7 @@
 				continue;
 			}
 			Material *ma = uid_material_map[ma_uid];
-			int l;
+			unsigned int l;
 			
 			// assign textures to uv layers
 			// bvi_array "bind_vertex_input array"
@@ -374,8 +374,14 @@
 			for (l = 0; l < bvi_array.getCount(); l++) {
 				COLLADAFW::TextureMapId tex_index = bvi_array[l].textureMapId;
 				size_t set_index = bvi_array[l].setIndex;
-				char *uvname = set_layername_map[set_index];
 				
+				/*if (set_layername_map.find(set_index) == set_layername_map.end()) {
+					fprintf(stderr, "Cannot find uvlayer name by set index.\n");
+					continue;
+				}
+				char *uvname = set_layername_map[set_index];*/
+				char *uvname = CustomData_get_layer_name(&me->fdata, CD_MTFACE, set_index);
+				
 				// check if mtexes were properly added to vector
 				if (index_mtex_map.find(tex_index) == index_mtex_map.end()) {
 					fprintf(stderr, "Cannot find mtexes by texmap id.\n");
@@ -393,7 +399,7 @@
 					diffuse_mtex = ma->mtex[l];
 				}
 			}
-			if (diffuse_mtex) {
+			if (diffuse_mtex && strlen(diffuse_mtex->uvname)) {
 				//diffuse_mtex = mtex;
 				if (first_time) {
 					tface = (MTFace*)CustomData_get_layer_named(&me->fdata, CD_MTFACE, diffuse_mtex->uvname);
@@ -903,7 +909,7 @@
 		for (i = 0; i < totuvset; i++) {
 			// add new CustomData layer
 			CustomData_add_layer(&me->fdata, CD_MTFACE, CD_CALLOC, NULL, totface);
-			this->set_layername_map[i] = CustomData_get_layer_name(&me->fdata, CD_MTFACE, i);
+			//this->set_layername_map[i] = CustomData_get_layer_name(&me->fdata, CD_MTFACE, i);
 			
 		}