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, 7 insertions, 6 deletions

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 67bc49032d5..09a4e42cb8f 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -211,6 +211,10 @@ typedef struct Material {
 	char nmap_tangent_names[9][64]; /* [MAX_MTFACE+1][MAX_NAME]; +1 for empty name */
 	int nmap_tangent_names_count, pad5;
 
+	/* image to use for image/uv space, also bake target
+	 * (not to be used shading/rendering pipeline, this is editor featyure only!). */
+	struct Image *edit_image;
+
 	struct TexPaintSlot *texpaintslot; /* cached slot for painting. Make sure to recalculate before use
 	                                    * with refresh_texpaint_image_cache */
 	ListBase gpumaterial;		/* runtime */
@@ -285,7 +289,7 @@ typedef struct Material {
 #define MA_ONLYSHADOW	1024
 #define MA_HALO_XALPHA	1024
 #define MA_STAR			0x800
-#define MA_FACETEXTURE	0x800
+// #define MA_FACETEXTURE	0x800	/* deprecated */
 #define MA_HALOTEX		0x1000
 #define MA_HALOPUNO		0x2000
 #define MA_ONLYCAST		0x2000
@@ -307,7 +311,7 @@ typedef struct Material {
 /* qdn: a bit clumsy this, tangents needed for normal maps separated from shading */
 #define MA_NORMAP_TANG	0x8000000
 #define MA_GROUP_NOLAY	0x10000000
-#define MA_FACETEXTURE_ALPHA	0x20000000
+// #define MA_FACETEXTURE_ALPHA	0x20000000	/* deprecated */
 #define MA_STR_B_UNITS	0x40000000
 #define MA_STR_SURFDIFF 0x80000000
 
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 3676066a399..5f204b82f04 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -188,7 +188,6 @@ typedef struct MVertTri {
 
 
 typedef struct MTexPoly {
-	struct Image *tpage;
 	char flag, transp;
 	short mode, tile, pad;
 } MTexPoly;
@@ -196,7 +195,6 @@ typedef struct MTexPoly {
 /* can copy from/to MTexPoly/MTFace */
 #define ME_MTEXFACE_CPY(dst, src)   \
 {                                   \
-	(dst)->tpage  = (src)->tpage;   \
 	(dst)->flag   = (src)->flag;    \
 	(dst)->transp = (src)->transp;  \
 	(dst)->mode   = (src)->mode;    \
@@ -256,7 +254,6 @@ typedef struct MSelect {
 /*tessellation uv face data*/
 typedef struct MTFace {
 	float uv[4][2];
-	struct Image *tpage;
 	char flag, transp;
 	short mode, tile, unwrap;
 } MTFace;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 823a7f0812f..4959055ed10 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -418,7 +418,7 @@ typedef struct UVProjectModifierData {
 	/* the objects which do the projecting */
 	struct Object *projectors[10]; /* MOD_UVPROJECT_MAXPROJECTORS */
 	struct Image *image;           /* the image to project */
-	int flags;
+	int pad2;
 	int num_projectors;
 	float aspectx, aspecty;
 	float scalex, scaley;