Remove Blender Internal and legacy viewport from Blender 2.8.

Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!

* Point density, voxel data, ocean, environment map textures were removed,
  as these only worked within BI rendering. Note that the ocean modifier
  and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
  with BI. If we ever wanted to support this again probably it should go
  through the baking API.
* GPU shader export through the Python API was removed. This only worked
  for the old BI GLSL shaders, which no longer exists. Doing something
  similar for Eevee would be significantly more complicated because it
  uses a lot of multiplass rendering and logic outside the shader, it's
  probably impractical.
* Collada material import / export code is mostly gone, as it only worked
  for BI materials. We need to add Cycles / Eevee material support at some
  point.
* The mesh noise operator was removed since it only worked with BI
  material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
  for BI material texture slots. Could be added back with node support.

* Not all legacy viewport features are supported in the new viewport, but
  their code was removed. If we need to bring anything back we can look at
  older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
  that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
  used anywhere now. We may eventually use this to replace the texture
  nodes with Cycles / Eevee shader nodes.

* The Cycles Bake panel now includes settings for baking multires normal
  and displacement maps. The underlying code needs to be merged properly,
  and we plan to add back support for multires AO baking and add support
  to Cycles baking for features like vertex color, displacement, and other
  missing baking features.

* This commit removes DNA and the Python API for BI material, lamp, world
  and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
  are reusing some old BI properties but the names are not really correct
  anymore.
* Texture slots for materials, lamps and world were removed. They remain
  for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
  other renderers use this to find all panels to show, minus a few panels
  that they have their own replacement for.

1 files changed, 0 insertions, 662 deletions

diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index 4281443220d..3b9d5c47ad2 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -59,11 +59,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "GPU_glew.h"
-#include "GPU_buffers.h"
-#include "GPU_shader.h"
-#include "GPU_basic_shader.h"
-
 static void bmdm_get_tri_colpreview(BMLoop *ls[3], MLoopCol *lcol[3], unsigned char(*color_vert_array)[4]);
 
 typedef struct EditDerivedBMesh {
@@ -370,90 +365,6 @@ static void emDM_foreachMappedEdge(
 	}
 }
 
-static void emDM_drawMappedEdges(
-        DerivedMesh *dm,
-        DMSetDrawOptions setDrawOptions,
-        void *userData)
-{
-	EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-	BMesh *bm = bmdm->em->bm;
-	BMEdge *eed;
-	BMIter iter;
-	int i;
-
-	if (bmdm->vertexCos) {
-
-		BM_mesh_elem_index_ensure(bm, BM_VERT);
-
-		glBegin(GL_LINES);
-		BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) {
-			if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
-				glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v1)]);
-				glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v2)]);
-			}
-		}
-		glEnd();
-	}
-	else {
-		glBegin(GL_LINES);
-		BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) {
-			if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
-				glVertex3fv(eed->v1->co);
-				glVertex3fv(eed->v2->co);
-			}
-		}
-		glEnd();
-	}
-}
-static void emDM_drawEdges(
-        DerivedMesh *dm,
-        bool UNUSED(drawLooseEdges),
-        bool UNUSED(drawAllEdges))
-{
-	emDM_drawMappedEdges(dm, NULL, NULL);
-}
-
-static void emDM_drawMappedEdgesInterp(
-        DerivedMesh *dm,
-        DMSetDrawOptions setDrawOptions,
-        DMSetDrawInterpOptions setDrawInterpOptions,
-        void *userData)
-{
-	EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-	BMesh *bm = bmdm->em->bm;
-	BMEdge *eed;
-	BMIter iter;
-	int i;
-
-	if (bmdm->vertexCos) {
-
-		BM_mesh_elem_index_ensure(bm, BM_VERT);
-
-		glBegin(GL_LINES);
-		BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) {
-			if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
-				setDrawInterpOptions(userData, i, 0.0);
-				glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v1)]);
-				setDrawInterpOptions(userData, i, 1.0);
-				glVertex3fv(bmdm->vertexCos[BM_elem_index_get(eed->v2)]);
-			}
-		}
-		glEnd();
-	}
-	else {
-		glBegin(GL_LINES);
-		BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) {
-			if (!setDrawOptions || (setDrawOptions(userData, i) != DM_DRAW_OPTION_SKIP)) {
-				setDrawInterpOptions(userData, i, 0.0);
-				glVertex3fv(eed->v1->co);
-				setDrawInterpOptions(userData, i, 1.0);
-				glVertex3fv(eed->v2->co);
-			}
-		}
-		glEnd();
-	}
-}
-
 static void emDM_foreachMappedLoop(
         DerivedMesh *dm,
         void (*func)(void *userData, int vertex_index, int face_index, const float co[3], const float no[3]),
@@ -526,571 +437,6 @@ static void emDM_foreachMappedFaceCenter(
 	}
 }
 
-static void emDM_drawMappedFaces(
-        DerivedMesh *dm,
-        DMSetDrawOptions setDrawOptions,
-        DMSetMaterial setMaterial,
-        /* currently unused -- each original face is handled separately */
-        DMCompareDrawOptions UNUSED(compareDrawOptions),
-        void *userData,
-        DMDrawFlag flag)
-{
-	EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-	BMEditMesh *em = bmdm->em;
-	BMesh *bm = em->bm;
-	BMFace *efa;
-	struct BMLoop *(*looptris)[3] = bmdm->em->looptris;
-	const int tottri = bmdm->em->tottri;
-	DMDrawOption draw_option;
-	int i;
-	const int skip_normals = !(flag & DM_DRAW_NEED_NORMALS);
-	const float (*lnors)[3] = dm->getLoopDataArray(dm, CD_NORMAL);
-	MLoopCol *lcol[3] = {NULL} /* , dummylcol = {0} */;
-	unsigned char(*color_vert_array)[4] = em->derivedVertColor;
-	unsigned char(*color_face_array)[4] = em->derivedFaceColor;
-	bool has_vcol_preview = (color_vert_array != NULL) && !skip_normals;
-	bool has_fcol_preview = (color_face_array != NULL) && !skip_normals;
-	bool has_vcol_any = has_vcol_preview;
-
-	/* GL_ZERO is used to detect if drawing has started or not */
-	GLenum poly_prev = GL_ZERO;
-	GLenum shade_prev = GL_ZERO;
-	DMDrawOption draw_option_prev = DM_DRAW_OPTION_SKIP;
-
-	/* call again below is ok */
-	if (has_vcol_preview) {
-		BM_mesh_elem_index_ensure(bm, BM_VERT);
-	}
-	if (has_fcol_preview) {
-		BM_mesh_elem_index_ensure(bm, BM_FACE);
-	}
-	if (has_vcol_preview || has_fcol_preview) {
-		flag |= DM_DRAW_ALWAYS_SMOOTH;
-		/* weak, this logic should really be moved higher up */
-		setMaterial = NULL;
-	}
-
-	if (bmdm->vertexCos) {
-		short prev_mat_nr = -1;
-
-		/* add direct access */
-		const float (*vertexCos)[3] = bmdm->vertexCos;
-		const float (*vertexNos)[3];
-		const float (*polyNos)[3];
-
-		if (skip_normals) {
-			vertexNos = NULL;
-			polyNos = NULL;
-		}
-		else {
-			emDM_ensureVertNormals(bmdm);
-			emDM_ensurePolyNormals(bmdm);
-			vertexNos = bmdm->vertexNos;
-			polyNos = bmdm->polyNos;
-		}
-
-		BM_mesh_elem_index_ensure(bm, lnors ? BM_VERT | BM_FACE | BM_LOOP : BM_VERT | BM_FACE);
-
-		for (i = 0; i < tottri; i++) {
-			BMLoop **ltri = looptris[i];
-			int drawSmooth;
-
-			efa = ltri[0]->f;
-			drawSmooth = lnors || ((flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : BM_elem_flag_test(efa, BM_ELEM_SMOOTH));
-
-			draw_option = (!setDrawOptions ?
-			               DM_DRAW_OPTION_NORMAL :
-			               setDrawOptions(userData, BM_elem_index_get(efa)));
-			if (draw_option != DM_DRAW_OPTION_SKIP) {
-				const GLenum poly_type = GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */
-
-				if (draw_option_prev != draw_option) {
-					if (draw_option_prev == DM_DRAW_OPTION_STIPPLE) {
-						if (poly_prev != GL_ZERO) glEnd();
-						poly_prev = GL_ZERO; /* force glBegin */
-
-						GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-					}
-					draw_option_prev = draw_option;
-				}
-
-
-				if (efa->mat_nr != prev_mat_nr) {
-					if (setMaterial) {
-						if (poly_prev != GL_ZERO) glEnd();
-						poly_prev = GL_ZERO; /* force glBegin */
-
-						setMaterial(efa->mat_nr + 1, NULL);
-					}
-					prev_mat_nr = efa->mat_nr;
-				}
-
-				if (draw_option == DM_DRAW_OPTION_STIPPLE) { /* enabled with stipple */
-
-					if (poly_prev != GL_ZERO) glEnd();
-					poly_prev = GL_ZERO; /* force glBegin */
-
-					GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-					GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_QUARTTONE);
-				}
-
-				if      (has_vcol_preview) bmdm_get_tri_colpreview(ltri, lcol, color_vert_array);
-				else if (has_fcol_preview) glColor3ubv((const GLubyte *)&(color_face_array[BM_elem_index_get(efa)]));
-				if (skip_normals) {
-					if (poly_type != poly_prev) {
-						if (poly_prev != GL_ZERO) glEnd();
-						glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
-					}
-					if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[0]->r));
-					glVertex3fv(vertexCos[BM_elem_index_get(ltri[0]->v)]);
-					if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[1]->r));
-					glVertex3fv(vertexCos[BM_elem_index_get(ltri[1]->v)]);
-					if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[2]->r));
-					glVertex3fv(vertexCos[BM_elem_index_get(ltri[2]->v)]);
-				}
-				else {
-					const GLenum shade_type = drawSmooth ? GL_SMOOTH : GL_FLAT;
-					if (shade_type != shade_prev) {
-						if (poly_prev != GL_ZERO) glEnd();
-						glShadeModel((shade_prev = shade_type)); /* same as below but switch shading */
-						glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
-					}
-					if (poly_type != poly_prev) {
-						if (poly_prev != GL_ZERO) glEnd();
-						glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
-					}
-
-					if (!drawSmooth) {
-						glNormal3fv(polyNos[BM_elem_index_get(efa)]);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[0]->r));
-						glVertex3fv(vertexCos[BM_elem_index_get(ltri[0]->v)]);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[1]->r));
-						glVertex3fv(vertexCos[BM_elem_index_get(ltri[1]->v)]);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[2]->r));
-						glVertex3fv(vertexCos[BM_elem_index_get(ltri[2]->v)]);
-					}
-					else {
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[0]->r));
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[0])]);
-						else glNormal3fv(vertexNos[BM_elem_index_get(ltri[0]->v)]);
-						glVertex3fv(vertexCos[BM_elem_index_get(ltri[0]->v)]);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[1]->r));
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[1])]);
-						else glNormal3fv(vertexNos[BM_elem_index_get(ltri[1]->v)]);
-						glVertex3fv(vertexCos[BM_elem_index_get(ltri[1]->v)]);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[2]->r));
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[2])]);
-						else glNormal3fv(vertexNos[BM_elem_index_get(ltri[2]->v)]);
-						glVertex3fv(vertexCos[BM_elem_index_get(ltri[2]->v)]);
-					}
-				}
-			}
-		}
-	}
-	else {
-		short prev_mat_nr = -1;
-
-		BM_mesh_elem_index_ensure(bm, lnors ? BM_FACE | BM_LOOP : BM_FACE);
-
-		for (i = 0; i < tottri; i++) {
-			BMLoop **ltri = looptris[i];
-			int drawSmooth;
-
-			efa = ltri[0]->f;
-			drawSmooth = lnors || ((flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : BM_elem_flag_test(efa, BM_ELEM_SMOOTH));
-			
-			draw_option = (setDrawOptions ?
-			                   setDrawOptions(userData, BM_elem_index_get(efa)) :
-			                   DM_DRAW_OPTION_NORMAL);
-
-			if (draw_option != DM_DRAW_OPTION_SKIP) {
-				const GLenum poly_type = GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */
-
-				if (draw_option_prev != draw_option) {
-					if (draw_option_prev == DM_DRAW_OPTION_STIPPLE) {
-						if (poly_prev != GL_ZERO) glEnd();
-						poly_prev = GL_ZERO; /* force glBegin */
-
-						GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-					}
-					draw_option_prev = draw_option;
-				}
-
-				if (efa->mat_nr != prev_mat_nr) {
-					if (setMaterial) {
-						if (poly_prev != GL_ZERO) glEnd();
-						poly_prev = GL_ZERO; /* force glBegin */
-
-						setMaterial(efa->mat_nr + 1, NULL);
-					}
-					prev_mat_nr = efa->mat_nr;
-				}
-				
-				if (draw_option == DM_DRAW_OPTION_STIPPLE) { /* enabled with stipple */
-
-					if (poly_prev != GL_ZERO) glEnd();
-					poly_prev = GL_ZERO; /* force glBegin */
-
-					GPU_basic_shader_bind(GPU_SHADER_STIPPLE | GPU_SHADER_USE_COLOR);
-					GPU_basic_shader_stipple(GPU_SHADER_STIPPLE_QUARTTONE);
-				}
-
-				if      (has_vcol_preview) bmdm_get_tri_colpreview(ltri, lcol, color_vert_array);
-				else if (has_fcol_preview) glColor3ubv((const GLubyte *)&(color_face_array[BM_elem_index_get(efa)]));
-
-				if (skip_normals) {
-					if (poly_type != poly_prev) {
-						if (poly_prev != GL_ZERO) glEnd();
-						glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
-					}
-					if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[0]->r));
-					glVertex3fv(ltri[0]->v->co);
-					if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[1]->r));
-					glVertex3fv(ltri[1]->v->co);
-					if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[2]->r));
-					glVertex3fv(ltri[2]->v->co);
-				}
-				else {
-					const GLenum shade_type = drawSmooth ? GL_SMOOTH : GL_FLAT;
-					if (shade_type != shade_prev) {
-						if (poly_prev != GL_ZERO) glEnd();
-						glShadeModel((shade_prev = shade_type)); /* same as below but switch shading */
-						glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
-					}
-					if (poly_type != poly_prev) {
-						if (poly_prev != GL_ZERO) glEnd();
-						glBegin((poly_prev = poly_type)); /* BMesh: will always be GL_TRIANGLES */
-					}
-
-					if (!drawSmooth) {
-						glNormal3fv(efa->no);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[0]->r));
-						glVertex3fv(ltri[0]->v->co);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[1]->r));
-						glVertex3fv(ltri[1]->v->co);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[2]->r));
-						glVertex3fv(ltri[2]->v->co);
-					}
-					else {
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[0]->r));
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[0])]);
-						else glNormal3fv(ltri[0]->v->no);
-						glVertex3fv(ltri[0]->v->co);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[1]->r));
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[1])]);
-						else glNormal3fv(ltri[1]->v->no);
-						glVertex3fv(ltri[1]->v->co);
-						if (has_vcol_any) glColor3ubv((const GLubyte *)&(lcol[2]->r));
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[2])]);
-						else glNormal3fv(ltri[2]->v->no);
-						glVertex3fv(ltri[2]->v->co);
-					}
-				}
-			}
-		}
-	}
-
-	/* if non zero we know a face was rendered */
-	if (poly_prev != GL_ZERO) glEnd();
-
-	if (draw_option_prev == DM_DRAW_OPTION_STIPPLE) {
-		GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-	}
-
-	if (shade_prev == GL_FLAT) {
-		glShadeModel(GL_SMOOTH);
-	}
-}
-
-static void bmdm_get_tri_colpreview(BMLoop *ls[3], MLoopCol *lcol[3], unsigned char(*color_vert_array)[4])
-{
-	lcol[0] = (MLoopCol *)color_vert_array[BM_elem_index_get(ls[0]->v)];
-	lcol[1] = (MLoopCol *)color_vert_array[BM_elem_index_get(ls[1]->v)];
-	lcol[2] = (MLoopCol *)color_vert_array[BM_elem_index_get(ls[2]->v)];
-}
-
-/**
- * \note
- *
- * For UV's:
- *   const MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(loop, attribs->tface[i].em_offset);
- *
- * This is intentionally different to calling:
- *   CustomData_bmesh_get_n(&bm->ldata, loop->head.data, CD_MLOOPUV, i);
- *
- * ... because the material may use layer names to select different UV's
- * see: [#34378]
- */
-static void emdm_pass_attrib_vertex_glsl(const DMVertexAttribs *attribs, const BMLoop *loop)
-{
-	BMVert *eve = loop->v;
-	int i;
-	const float zero[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-
-	if (attribs->totorco) {
-		int index = BM_elem_index_get(eve);
-		const float *orco = (attribs->orco.array) ? attribs->orco.array[index] : zero;
-
-		if (attribs->orco.gl_texco)
-			glTexCoord3fv(orco);
-		else
-			glVertexAttrib3fv(attribs->orco.gl_index, orco);
-	}
-	for (i = 0; i < attribs->tottface; i++) {
-		const float *uv;
-
-		if (attribs->tface[i].em_offset != -1) {
-			const MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(loop, attribs->tface[i].em_offset);
-			uv = luv->uv;
-		}
-		else {
-			uv = zero;
-		}
-
-		if (attribs->tface[i].gl_texco)
-			glTexCoord2fv(uv);
-		else
-			glVertexAttrib2fv(attribs->tface[i].gl_index, uv);
-	}
-	for (i = 0; i < attribs->totmcol; i++) {
-		float col[4];
-		if (attribs->mcol[i].em_offset != -1) {
-			const MLoopCol *cp = BM_ELEM_CD_GET_VOID_P(loop, attribs->mcol[i].em_offset);
-			rgba_uchar_to_float(col, &cp->r);
-		}
-		else {
-			col[0] = 0.0f; col[1] = 0.0f; col[2] = 0.0f; col[3] = 0.0f;
-		}
-		glVertexAttrib4fv(attribs->mcol[i].gl_index, col);
-	}
-
-	for (i = 0; i < attribs->tottang; i++) {
-		const float *tang;
-		if (attribs->tang[i].em_offset != -1) {
-			tang = attribs->tang[i].array[BM_elem_index_get(loop)];
-		}
-		else {
-			tang = zero;
-		}
-		glVertexAttrib4fv(attribs->tang[i].gl_index, tang);
-	}
-}
-
-static void emDM_drawMappedFacesGLSL(
-        DerivedMesh *dm,
-        DMSetMaterial setMaterial,
-        DMSetDrawOptions setDrawOptions,
-        void *userData)
-{
-	EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-	BMEditMesh *em = bmdm->em;
-	BMesh *bm = em->bm;
-	struct BMLoop *(*looptris)[3] = em->looptris;
-	/* add direct access */
-	const float (*vertexCos)[3] = bmdm->vertexCos;
-	const float (*vertexNos)[3];
-	const float (*polyNos)[3];
-	const float (*lnors)[3] = dm->getLoopDataArray(dm, CD_NORMAL);
-
-	BMFace *efa;
-	DMVertexAttribs attribs;
-	GPUVertexAttribs gattribs;
-
-	int i, matnr, new_matnr, fi;
-	bool do_draw;
-
-	do_draw = false;
-	matnr = -1;
-
-	memset(&attribs, 0, sizeof(attribs));
-
-	emDM_ensureVertNormals(bmdm);
-	emDM_ensurePolyNormals(bmdm);
-	vertexNos = bmdm->vertexNos;
-	polyNos = bmdm->polyNos;
-
-	BM_mesh_elem_index_ensure(bm, (BM_VERT | BM_FACE) | (lnors ? BM_LOOP : 0));
-
-	for (i = 0; i < em->tottri; i++) {
-		BMLoop **ltri = looptris[i];
-		int drawSmooth;
-
-		efa = ltri[0]->f;
-
-		if (setDrawOptions && (setDrawOptions(userData, BM_elem_index_get(efa)) == DM_DRAW_OPTION_SKIP))
-			continue;
-
-		/* material */
-		new_matnr = efa->mat_nr + 1;
-		if (new_matnr != matnr) {
-			if (matnr != -1)
-				glEnd();
-
-			do_draw = setMaterial(matnr = new_matnr, &gattribs);
-			if (do_draw) {
-				DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
-				DM_draw_attrib_vertex_uniforms(&attribs);
-				if (UNLIKELY(attribs.tottang && bm->elem_index_dirty & BM_LOOP)) {
-					BM_mesh_elem_index_ensure(bm, BM_LOOP);
-				}
-			}
-
-			glBegin(GL_TRIANGLES);
-		}
-
-		if (do_draw) {
-
-			/* draw face */
-			drawSmooth = lnors || BM_elem_flag_test(efa, BM_ELEM_SMOOTH);
-
-			if (!drawSmooth) {
-				if (vertexCos) {
-					glNormal3fv(polyNos[BM_elem_index_get(efa)]);
-					for (fi = 0; fi < 3; fi++) {
-						emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-						glVertex3fv(vertexCos[BM_elem_index_get(ltri[fi]->v)]);
-					}
-				}
-				else {
-					glNormal3fv(efa->no);
-					for (fi = 0; fi < 3; fi++) {
-						emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-						glVertex3fv(ltri[fi]->v->co);
-					}
-				}
-			}
-			else {
-				if (vertexCos) {
-					for (fi = 0; fi < 3; fi++) {
-						const int j = BM_elem_index_get(ltri[fi]->v);
-						emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[fi])]);
-						else glNormal3fv(vertexNos[j]);
-						glVertex3fv(vertexCos[j]);
-					}
-				}
-				else {
-					for (fi = 0; fi < 3; fi++) {
-						emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-						if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[fi])]);
-						else glNormal3fv(ltri[fi]->v->no);
-						glVertex3fv(ltri[fi]->v->co);
-					}
-				}
-			}
-		}
-	}
-
-	if (matnr != -1) {
-		glEnd();
-	}
-}
-
-static void emDM_drawFacesGLSL(
-        DerivedMesh *dm,
-        int (*setMaterial)(int matnr, void *attribs))
-{
-	dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL);
-}
-
-static void emDM_drawMappedFacesMat(
-        DerivedMesh *dm,
-        void (*setMaterial)(void *userData, int matnr, void *attribs),
-        bool (*setFace)(void *userData, int index), void *userData)
-{
-	EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
-	BMEditMesh *em = bmdm->em;
-	BMesh *bm = em->bm;
-	struct BMLoop *(*looptris)[3] = em->looptris;
-	const float (*vertexCos)[3] = bmdm->vertexCos;
-	const float (*vertexNos)[3];
-	const float (*polyNos)[3];
-	const float (*lnors)[3] = dm->getLoopDataArray(dm, CD_NORMAL);
-	BMFace *efa;
-	DMVertexAttribs attribs = {{{NULL}}};
-	GPUVertexAttribs gattribs;
-	int i, matnr, new_matnr, fi;
-
-	matnr = -1;
-
-	emDM_ensureVertNormals(bmdm);
-	emDM_ensurePolyNormals(bmdm);
-
-	vertexNos = bmdm->vertexNos;
-	polyNos = bmdm->polyNos;
-
-	BM_mesh_elem_index_ensure(bm, (BM_VERT | BM_FACE) | (lnors ? BM_LOOP : 0));
-
-	for (i = 0; i < em->tottri; i++) {
-		BMLoop **ltri = looptris[i];
-		int drawSmooth;
-
-		efa = ltri[0]->f;
-
-		/* face hiding */
-		if (setFace && !setFace(userData, BM_elem_index_get(efa)))
-			continue;
-
-		/* material */
-		new_matnr = efa->mat_nr + 1;
-		if (new_matnr != matnr) {
-			if (matnr != -1)
-				glEnd();
-
-			setMaterial(userData, matnr = new_matnr, &gattribs);
-			DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
-			if (UNLIKELY(attribs.tottang && bm->elem_index_dirty & BM_LOOP)) {
-				BM_mesh_elem_index_ensure(bm, BM_LOOP);
-			}
-
-			glBegin(GL_TRIANGLES);
-		}
-
-		/* draw face */
-		drawSmooth = lnors || BM_elem_flag_test(efa, BM_ELEM_SMOOTH);
-
-		if (!drawSmooth) {
-			if (vertexCos) {
-				glNormal3fv(polyNos[BM_elem_index_get(efa)]);
-				for (fi = 0; fi < 3; fi++) {
-					emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-					glVertex3fv(vertexCos[BM_elem_index_get(ltri[fi]->v)]);
-				}
-			}
-			else {
-				glNormal3fv(efa->no);
-				for (fi = 0; fi < 3; fi++) {
-					emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-					glVertex3fv(ltri[fi]->v->co);
-				}
-			}
-		}
-		else {
-			if (vertexCos) {
-				for (fi = 0; fi < 3; fi++) {
-					const int j = BM_elem_index_get(ltri[fi]->v);
-					emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-					if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[fi])]);
-					else glNormal3fv(vertexNos[j]);
-					glVertex3fv(vertexCos[j]);
-				}
-			}
-			else {
-				for (fi = 0; fi < 3; fi++) {
-					emdm_pass_attrib_vertex_glsl(&attribs, ltri[fi]);
-					if (lnors) glNormal3fv(lnors[BM_elem_index_get(ltri[fi])]);
-					else glNormal3fv(ltri[fi]->v->no);
-					glVertex3fv(ltri[fi]->v->co);
-				}
-			}
-		}
-	}
-
-	if (matnr != -1) {
-		glEnd();
-	}
-}
-
 static void emDM_getMinMax(DerivedMesh *dm, float r_min[3], float r_max[3])
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
@@ -1660,14 +1006,6 @@ DerivedMesh *getEditDerivedBMesh(
 	bmdm->dm.foreachMappedEdge = emDM_foreachMappedEdge;
 	bmdm->dm.foreachMappedFaceCenter = emDM_foreachMappedFaceCenter;
 
-	bmdm->dm.drawEdges = emDM_drawEdges;
-	bmdm->dm.drawMappedEdges = emDM_drawMappedEdges;
-	bmdm->dm.drawMappedEdgesInterp = emDM_drawMappedEdgesInterp;
-	bmdm->dm.drawMappedFaces = emDM_drawMappedFaces;
-	bmdm->dm.drawMappedFacesGLSL = emDM_drawMappedFacesGLSL;
-	bmdm->dm.drawMappedFacesMat = emDM_drawMappedFacesMat;
-	bmdm->dm.drawFacesGLSL = emDM_drawFacesGLSL;
-
 	bmdm->dm.release = emDM_release;
 
 	bmdm->vertexCos = (const float (*)[3])vertexCos;