Cleanup: Remove unused modifiers callback

Was only used by subsurf in the past years, it is unlikely
other modifiers will every need this any time soon.

3 files changed, 2 insertions, 41 deletions

diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 2be91406524..6b64b1663d8 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -172,7 +172,6 @@ typedef struct ModifierTypeInfo {
 	/********************* Non-deform modifier functions *********************/ /* DEPRECATED */
 
 	void (*applyModifier_DM_removed)(void);
-	void (*applyModifierEM_DM_removed)(void);
 
 	/********************* Deform modifier functions *********************/
 
@@ -213,17 +212,6 @@ typedef struct ModifierTypeInfo {
 	struct Mesh *(*applyModifier)(struct ModifierData *md, const struct ModifierEvalContext *ctx,
 	                              struct Mesh *mesh);
 
-	/* Like applyModifier but called during editmode (for supporting
-	 * modifiers).
-	 *
-	 * The mesh object that is returned must support the operations that
-	 * are expected from editmode objects. The same qualifications regarding
-	 * mesh apply as for applyModifier.
-	 */
-	struct Mesh *(*applyModifierEM)(struct ModifierData *md, const struct ModifierEvalContext *ctx,
-	                                struct BMEditMesh *editData,
-	                                struct Mesh *mesh);
-
 
 	/********************* Optional functions *********************/
 
@@ -428,10 +416,6 @@ struct Mesh *modwrap_applyModifier(
         ModifierData *md, const struct ModifierEvalContext *ctx,
         struct Mesh *me);
 
-struct Mesh *modwrap_applyModifierEM(
-        ModifierData *md, const struct ModifierEvalContext *ctx,
-        struct BMEditMesh *em, struct Mesh *me);
-
 void modwrap_deformVerts(
         ModifierData *md, const struct ModifierEvalContext *ctx,
         struct Mesh *me,
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 00f2454d53b..c84bd378b04 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1783,12 +1783,7 @@ static void editbmesh_calc_modifiers(
 				mask &= ~CD_MASK_ORCO;
 				mesh_set_only_copy(me_orco, mask | CD_MASK_ORIGINDEX);
 
-				if (mti->applyModifierEM) {
-					me_next = modwrap_applyModifierEM(md, &mectx_orco, em, me_orco);
-				}
-				else {
-					me_next = modwrap_applyModifier(md, &mectx_orco, me_orco);
-				}
+				me_next = modwrap_applyModifier(md, &mectx_orco, me_orco);
 				ASSERT_IS_VALID_MESH(me_next);
 
 				if (me_next) {
@@ -1813,12 +1808,7 @@ static void editbmesh_calc_modifiers(
 				}
 			}
 
-			if (mti->applyModifierEM) {
-				me_next = modwrap_applyModifierEM(md, &mectx_cache, em, me);
-			}
-			else {
-				me_next = modwrap_applyModifier(md, &mectx_cache, me);
-			}
+			me_next = modwrap_applyModifier(md, &mectx_cache, me);
 			ASSERT_IS_VALID_MESH(me_next);
 
 			if (me_next) {
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 41c35de8aea..73a9d462687 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -839,19 +839,6 @@ struct Mesh *modwrap_applyModifier(
 	return mti->applyModifier(md, ctx, me);
 }
 
-struct Mesh *modwrap_applyModifierEM(
-        ModifierData *md, const ModifierEvalContext *ctx,
-        struct BMEditMesh *em, Mesh *me)
-{
-	const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
-	BLI_assert(CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
-
-	if (mti->dependsOnNormals && mti->dependsOnNormals(md)) {
-		BKE_mesh_calc_normals(me);
-	}
-	return mti->applyModifierEM(md, ctx, em, me);
-}
-
 void modwrap_deformVerts(
         ModifierData *md, const ModifierEvalContext *ctx,
         Mesh *me, float (*vertexCos)[3], int numVerts)