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

[Chingiz Dyussenov]

Revision: 21886
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21886
Author:   chingachgook
Date:     2009-07-25 17:12:56 +0200 (Sat, 25 Jul 2009)

Log Message:
-----------
Another fix to textures import.

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-25 15:05:51 UTC (rev 21885)
+++ branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp	2009-07-25 15:12:56 UTC (rev 21886)
@@ -383,21 +383,25 @@
 				for (it = mtexes.begin(); it != mtexes.end(); it++) {
 					MTex *mtex = *it;
 					strcpy(mtex->uvname, uvname);
-					if (mtex->mapto == MAP_COL) {
-						diffuse_mtex = mtex;
-						if (first_time) {
-							tface = (MTFace*)CustomData_get_layer_named(&me->fdata, CD_MTFACE, mtex->uvname);
-							strcpy(layername, diffuse_mtex->uvname);
-							first_time = false;
-						}
-						else if (strcmp(diffuse_mtex->uvname, layername) != 0) {
-							tface = (MTFace*)CustomData_get_layer_named(&me->fdata, CD_MTFACE, mtex->uvname);
-							strcpy(layername, diffuse_mtex->uvname);
-						}
-					}
 				}	
 			}
-			
+			for (l = 0; l < 18; l++) {
+				if (ma->mtex[l] && ma->mtex[l]->mapto == MAP_COL) {
+					diffuse_mtex = ma->mtex[l];
+				}
+			}
+			if (diffuse_mtex) {
+				//diffuse_mtex = mtex;
+				if (first_time) {
+					tface = (MTFace*)CustomData_get_layer_named(&me->fdata, CD_MTFACE, diffuse_mtex->uvname);
+					strcpy(layername, diffuse_mtex->uvname);
+					first_time = false;
+				}
+				else if (strcmp(diffuse_mtex->uvname, layername) != 0) {
+					tface = (MTFace*)CustomData_get_layer_named(&me->fdata, CD_MTFACE, diffuse_mtex->uvname);
+					strcpy(layername, diffuse_mtex->uvname);
+				}
+			}
 			assign_material(ob, ma, ob->totcol + 1);
 			
 			MaterialIdPrimitiveArrayMap& mat_prim_map = geom_uid_mat_mapping_map[*geom_uid];