Modifiers: cleanup/harmonize deform modifiers code re. mesh source.

Also fixes a few issues (like meshdeform's EM variant not using editmesh
data), and adds a few optimizations (like only generating that source
mesh when we do have a vgroup defined in parameters, for modifiers only
using it to access vgroup)...

1 files changed, 5 insertions, 11 deletions

diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c
index e2434985230..8b62c2c1d7d 100644
--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -216,11 +216,8 @@ static void deformVerts(
 	SmoothModifierData *smd = (SmoothModifierData *)md;
 	Mesh *mesh_src = NULL;
 
-	if (ctx->object->type == OB_MESH) {
-		/* mesh_src is needed for vgroups, and taking edges into account. */
-		mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false);
-		BLI_assert(mesh_src->totvert == numVerts);
-	}
+	/* mesh_src is needed for vgroups, and taking edges into account. */
+	mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false);
 
 	smoothModifier_do(smd, ctx->object, mesh_src, vertexCos, numVerts);
 
@@ -234,13 +231,10 @@ static void deformVertsEM(
         Mesh *mesh, float (*vertexCos)[3], int numVerts)
 {
 	SmoothModifierData *smd = (SmoothModifierData *)md;
-	Mesh *mesh_src = mesh;
-
-	if (mesh_src == NULL) {
-		mesh_src = BKE_mesh_from_bmesh_for_eval_nomain(editData->bm, 0);
-	}
+	Mesh *mesh_src = NULL;
 
-	BLI_assert(mesh_src->totvert == numVerts);
+	/* mesh_src is needed for vgroups, and taking edges into account. */
+	mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, NULL, numVerts, false, false);
 
 	smoothModifier_do(smd, ctx->object, mesh_src, vertexCos, numVerts);