[Bf-blender-cvs] [2deeca4fb00] blender2.8: Cleanup: remove references to DerivedMesh

[Campbell Barton]

Commit: 2deeca4fb00363d1d9098b7d6983bf5ed8767fa7
Author: Campbell Barton
Date:   Mon Oct 15 16:06:42 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB2deeca4fb00363d1d9098b7d6983bf5ed8767fa7

Cleanup: remove references to DerivedMesh

===================================================================

M	source/blender/blenkernel/BKE_DerivedMesh.h
M	source/blender/blenkernel/intern/editmesh.c
M	source/blender/blenkernel/intern/mesh_runtime.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index db918bb0fbd..69dda178c67 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -122,7 +122,6 @@ typedef struct DMFlagMat {
 
 typedef enum DerivedMeshType {
 	DM_TYPE_CDDM,
-	DM_TYPE_EDITBMESH,
 	DM_TYPE_CCGDM
 } DerivedMeshType;
 
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 0d09f4be39f..7e3693987f7 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -155,15 +155,12 @@ void BKE_editmesh_tessface_calc(BMEditMesh *em)
 
 	/* commented because editbmesh_build_data() ensures we get tessfaces */
 #if 0
-	if (em->derivedFinal && em->derivedFinal == em->derivedCage) {
-		if (em->derivedFinal->recalcTessellation)
-			em->derivedFinal->recalcTessellation(em->derivedFinal);
+	if (em->mesh_eval_final && em->mesh_eval_final == em->mesh_eval_cage) {
+		BKE_mesh_runtime_looptri_ensure(em->mesh_eval_final);
 	}
-	else if (em->derivedFinal) {
-		if (em->derivedCage->recalcTessellation)
-			em->derivedCage->recalcTessellation(em->derivedCage);
-		if (em->derivedFinal->recalcTessellation)
-			em->derivedFinal->recalcTessellation(em->derivedFinal);
+	else if (em->mesh_eval_final) {
+		BKE_mesh_runtime_looptri_ensure(em->mesh_eval_final);
+		BKE_mesh_runtime_looptri_ensure(em->mesh_eval_cage);
 	}
 #endif
 }
diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c
index f74be727362..68880cacfb9 100644
--- a/source/blender/blenkernel/intern/mesh_runtime.c
+++ b/source/blender/blenkernel/intern/mesh_runtime.c
@@ -271,7 +271,6 @@ char *BKE_mesh_runtime_debug_info(Mesh *me_eval)
 	const char *tstr;
 	switch (me_eval->type) {
 		case DM_TYPE_CDDM:     tstr = "DM_TYPE_CDDM";     break;
-		case DM_TYPE_EDITBMESH: tstr = "DM_TYPE_EDITMESH";  break;
 		case DM_TYPE_CCGDM:    tstr = "DM_TYPE_CCGDM";     break;
 		default:               tstr = "UNKNOWN";           break;
 	}