TexFace removal part 2

- Derived-mesh drawing.
- All non UV members of TexFace structs.

MTexPoly is now redundant but keeping with a dummy member,
will check on complete removal later.

1 files changed, 1 insertions, 67 deletions

diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 5f204b82f04..11a52649bf3 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -188,19 +188,9 @@ typedef struct MVertTri {
 
 
 typedef struct MTexPoly {
-	char flag, transp;
-	short mode, tile, pad;
+	void *pad;
 } MTexPoly;
 
-/* can copy from/to MTexPoly/MTFace */
-#define ME_MTEXFACE_CPY(dst, src)   \
-{                                   \
-	(dst)->flag   = (src)->flag;    \
-	(dst)->transp = (src)->transp;  \
-	(dst)->mode   = (src)->mode;    \
-	(dst)->tile   = (src)->tile;    \
-} (void)0
-
 typedef struct MLoopUV {
 	float uv[2];
 	int flag;
@@ -254,8 +244,6 @@ typedef struct MSelect {
 /*tessellation uv face data*/
 typedef struct MTFace {
 	float uv[4][2];
-	char flag, transp;
-	short mode, tile, unwrap;
 } MTFace;
 
 /*Custom Data Properties*/
@@ -460,58 +448,4 @@ enum {
 	ME_FSEL = 2,
 };
 
-/* mtface->flag */
-enum {
-	// TF_SELECT = (1 << 0),  /* use MFace hide flag (after 2.43), should be able to reuse after 2.44 */
-	// TF_ACTIVE = (1 << 1),  /* deprecated! */
-	TF_SEL1   = (1 << 2),
-	TF_SEL2   = (1 << 3),
-	TF_SEL3   = (1 << 4),
-	TF_SEL4   = (1 << 5),
-};
-
-/* mtface->mode */
-enum {
-	TF_DYNAMIC    = (1 << 0),
-	TF_ALPHASORT  = (1 << 1),
-	TF_TEX        = (1 << 2),
-	TF_SHAREDVERT = (1 << 3),
-	TF_LIGHT      = (1 << 4),
-
-	TF_CONVERTED  = (1 << 5),  /* tface converted to material */
-
-	TF_SHAREDCOL  = (1 << 6),
-	// TF_TILES      = (1 << 7),  /* deprecated */
-	TF_BILLBOARD  = (1 << 8),
-	TF_TWOSIDE    = (1 << 9),
-	TF_INVISIBLE  = (1 << 10),
-
-	TF_OBCOL      = (1 << 11),
-	TF_BILLBOARD2 = (1 << 12),  /* with Z axis constraint */
-	TF_SHADOW     = (1 << 13),
-	TF_BMFONT     = (1 << 14),
-};
-
-/* mtface->transp, values 1-4 are used as flags in the GL, WARNING, TF_SUB cant work with this */
-enum {
-	TF_SOLID = 0,
-	TF_ADD   = (1 << 0),
-	TF_ALPHA = (1 << 1),
-	TF_CLIP  = (1 << 2),  /* clipmap alpha/binary alpha all or nothing! */
-
-	TF_SUB   = 3,  /* sub is not available in the user interface anymore */
-};
-
-/* mtface->unwrap */
-enum {
-	TF_DEPRECATED1 = (1 << 0),
-	TF_DEPRECATED2 = (1 << 1),
-	TF_DEPRECATED3 = (1 << 2),
-	TF_DEPRECATED4 = (1 << 3),
-	TF_PIN1        = (1 << 4),
-	TF_PIN2        = (1 << 5),
-	TF_PIN3        = (1 << 6),
-	TF_PIN4        = (1 << 7),
-};
-
 #endif  /* __DNA_MESHDATA_TYPES_H__ */