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.

3 files changed, 16 insertions, 10 deletions

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 6add30f1131..68939d6ac21 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -589,17 +589,17 @@ static bool ConvertMaterial(
 		/* In Multitexture use the face texture if and only if
 		 * it is set in the buttons
 		 * In GLSL is not working yet :/ 3.2011 */
-		bool facetex = false;
-		if (validface && mat->mode & MA_FACETEXTURE) {
-			facetex = true;
-		}
 
 		// foreach MTex
 		for (int i = 0; i < MAXTEX; i++) {
 			// use face tex
-			if (i == 0 && facetex ) {
-				facetex = false;
+			if (i == 0) {
+#if 0
 				Image *tmp = (Image *)(tface->tpage);
+#else
+				/* weak but better then nothing */
+				Image *tmp = mat ? mat->edit_image : NULL;
+#endif
 
 				if (tmp) {
 					material->img[i] = tmp;
@@ -789,7 +789,11 @@ static bool ConvertMaterial(
 
 		// check for tface tex to fallback on
 		if (validface) {
+#if 0
 			material->img[0] = (Image *)(tface->tpage);
+#else
+			material->img[0] = mat ? mat->edit_image : NULL;
+#endif
 			// ------------------------
 			if (material->img[0]) {
 				material->texname[0] = material->img[0]->id.name;
@@ -894,7 +898,7 @@ static RAS_MaterialBucket *material_from_mesh(Material *ma, MFace *mface, MTFace
 		ConvertMaterial(bl_mat, ma, tface, tfaceName, mface, mcol,
 			converter->GetGLSLMaterials());
 
-		if (ma && (ma->mode & MA_FACETEXTURE) == 0)
+		if (ma)
 			converter->CacheBlenderMaterial(scene, ma, bl_mat);
 	}
 
@@ -910,7 +914,7 @@ static RAS_MaterialBucket *material_from_mesh(Material *ma, MFace *mface, MTFace
 
 		kx_blmat->Initialize(scene, bl_mat, (ma?&ma->game:NULL), lightlayer);
 		polymat = static_cast<RAS_IPolyMaterial*>(kx_blmat);
-		if (ma && (ma->mode & MA_FACETEXTURE) == 0)
+		if (ma)
 			converter->CachePolyMaterial(scene, ma, polymat);
 	}
 	
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index d26e35f8138..0aa17c59337 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -190,7 +190,7 @@ Material *KX_BlenderMaterial::GetBlenderMaterial() const
 
 Image *KX_BlenderMaterial::GetBlenderImage() const
 {
-	return mMaterial->mtexpoly.tpage;
+	return mMaterial->material ? mMaterial->material->edit_image : NULL;
 }
 
 Scene* KX_BlenderMaterial::GetBlenderScene() const
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index 5eed9b3b8f8..cac804ed22b 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -60,6 +60,7 @@
 extern "C"{
 	#include "BLF_api.h"
 	#include "BKE_DerivedMesh.h"
+	#include "DNA_material_types.h"
 }
 
 
@@ -785,8 +786,9 @@ static DMDrawOption CheckTexDM(MTexPoly *mtexpoly, const bool has_mcol, int matn
 {
 
 	// index is the original face index, retrieve the polygon
+	Material *bl_material = current_polymat->GetBlenderMaterial();
 	if (matnr == current_blmat_nr &&
-		(mtexpoly == NULL || mtexpoly->tpage == current_image)) {
+		(mtexpoly == NULL || (bl_material ? bl_material->edit_image : NULL) == current_image)) {
 		// must handle color.
 		if (current_wireframe)
 			return DM_DRAW_OPTION_NO_MCOL;