Remove TexFace, per-face images

TexFace complicates the now more popular shading pipeline by having
per-face images, see: T51382 for details.

To keep the ability to select a per-material edit-image
(used with UV-mapping workflow), the material now stores an image
which will be set when changing images in edit-mode.

This is used as a bake-target when not using Cycles too.

1 files changed, 8 insertions, 27 deletions

diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 8f3bf88af65..aec08c591b5 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -1051,11 +1051,11 @@ void MeshImporter::optimize_material_assignements()
  * which materials shall be moved to the created geometries. Also see
  * optimize_material_assignements() above.
  */
-MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmaterial,
-                                              std::map<COLLADAFW::UniqueId, Material *>& uid_material_map,
-                                              Object *ob, const COLLADAFW::UniqueId *geom_uid,
-                                              char *layername, MTFace *texture_face,
-                                              std::map<Material *, TexIndexTextureArrayMap>& material_texture_mapping_map, short mat_index)
+void MeshImporter::assign_material_to_geom(
+        COLLADAFW::MaterialBinding cmaterial,
+        std::map<COLLADAFW::UniqueId, Material *>& uid_material_map,
+        Object *ob, const COLLADAFW::UniqueId *geom_uid,
+        std::map<Material *, TexIndexTextureArrayMap>& material_texture_mapping_map, short mat_index)
 {
 	MTex *color_texture = NULL;
 	Mesh *me = (Mesh *)ob->data;
@@ -1089,15 +1089,6 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
 		                                            color_texture);
 	}
 	
-	// set texture face
-	if (color_texture &&
-	    strlen((color_texture)->uvname) &&
-	    !STREQ(layername, color_texture->uvname)) {
-		texture_face = (MTFace *)CustomData_get_layer_named(&me->fdata, CD_MTFACE,
-		                                                    color_texture->uvname);
-		strcpy(layername, color_texture->uvname);
-	}
-	
 	MaterialIdPrimitiveArrayMap& mat_prim_map = geom_uid_mat_mapping_map[*geom_uid];
 	COLLADAFW::MaterialId mat_id = cmaterial.getMaterialId();
 	
@@ -1114,15 +1105,9 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
 
 			for (i = 0; i < prim.totpoly; i++, mpoly++) {
 				mpoly->mat_nr = mat_index;
-				// bind texture images to faces
-				if (texture_face && color_texture) {
-					texture_face->tpage = (Image *)color_texture->tex->ima;
-					texture_face++;
-				}
 			}
 		}
 	}	
-	return texture_face;
 }
 
 Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::InstanceGeometry *geom,
@@ -1175,10 +1160,6 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
 
 	if (old_mesh->id.us == 0) BKE_libblock_free(G.main, old_mesh);
 	
-	char layername[100];
-	layername[0] = '\0';
-	MTFace *texture_face = NULL;
-	
 	COLLADAFW::MaterialBindingArray& mat_array =
 	    geom->getMaterialBindings();
 	
@@ -1186,9 +1167,9 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
 	for (unsigned int i = 0; i < mat_array.getCount(); i++) {
 		
 		if (mat_array[i].getReferencedMaterial().isValid()) {
-			texture_face = assign_material_to_geom(mat_array[i], uid_material_map, ob, geom_uid,
-			                                       layername, texture_face,
-			                                       material_texture_mapping_map, i);
+			assign_material_to_geom(
+			        mat_array[i], uid_material_map, ob, geom_uid,
+			        material_texture_mapping_map, i);
 		}
 		else {
 			fprintf(stderr, "invalid referenced material for %s\n", mat_array[i].getName().c_str());