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, 0 insertions, 18 deletions

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 1ac1fd10da6..116724463ca 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -142,8 +142,6 @@ typedef int (*DMSetMaterial)(int mat_nr, void *attribs);
 typedef int (*DMCompareDrawOptions)(void *userData, int cur_index, int next_index);
 typedef void (*DMSetDrawInterpOptions)(void *userData, int index, float t);
 typedef DMDrawOption (*DMSetDrawOptions)(void *userData, int index);
-typedef DMDrawOption (*DMSetDrawOptionsMappedTex)(void *userData, int origindex, int mat_nr);
-typedef DMDrawOption (*DMSetDrawOptionsTex)(struct MTexPoly *mtexpoly, const bool has_vcol, int matnr);
 
 typedef enum DMDrawFlag {
 	DM_DRAW_USE_COLORS          = (1 << 0),
@@ -406,14 +404,6 @@ struct DerivedMesh {
 	void (*drawFacesSolid)(DerivedMesh *dm, float (*partial_redraw_planes)[4],
 	                       bool fast, DMSetMaterial setMaterial);
 
-	/** Draw all faces using MTFace
-	 * - Drawing options too complicated to enumerate, look at code.
-	 */
-	void (*drawFacesTex)(DerivedMesh *dm,
-	                     DMSetDrawOptionsTex setDrawOptions,
-	                     DMCompareDrawOptions compareDrawOptions,
-	                     void *userData, DMDrawFlag flag);
-
 	/** Draw all faces with GLSL materials
 	 *  o setMaterial is called for every different material nr
 	 *  o Only if setMaterial returns true
@@ -440,14 +430,6 @@ struct DerivedMesh {
 	                        void *userData,
 	                        DMDrawFlag flag);
 
-	/** Draw mapped faces using MTFace
-	 * - Drawing options too complicated to enumerate, look at code.
-	 */
-	void (*drawMappedFacesTex)(DerivedMesh *dm,
-	                           DMSetDrawOptionsMappedTex setDrawOptions,
-	                           DMCompareDrawOptions compareDrawOptions,
-	                           void *userData, DMDrawFlag flag);
-
 	/** Draw mapped faces with GLSL materials
 	 * - setMaterial is called for every different material nr
 	 * - setDrawOptions is called for every face