[Bf-blender-cvs] [4543da6ca63] blender2.8: MOD_simpledeform: do not compute mesh when not needed.

[Bastien Montagne]

Commit: 4543da6ca63d227ed9ad809fbbdd765acab7aba6
Author: Bastien Montagne
Date:   Tue Nov 27 15:49:30 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB4543da6ca63d227ed9ad809fbbdd765acab7aba6

MOD_simpledeform: do not compute mesh when not needed.

Related to T57972.

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

M	source/blender/modifiers/intern/MOD_simpledeform.c

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

diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c
index 86791e5bcbe..f37cda25c58 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -385,11 +385,18 @@ static void deformVerts(
         float (*vertexCos)[3],
         int numVerts)
 {
-	Mesh *mesh_src = MOD_get_mesh_eval(ctx->object, NULL, mesh, NULL, false, false);
+	SimpleDeformModifierData *sdmd = (SimpleDeformModifierData *)md;
+	Mesh *mesh_src = NULL;
 
-	SimpleDeformModifier_do((SimpleDeformModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts);
+	if (ctx->object->type == OB_MESH) {
+		/* mesh_src is only needed for vgroups. */
+		mesh_src = MOD_get_mesh_eval(ctx->object, NULL, mesh, NULL, false, false);
+		BLI_assert(mesh_src->totvert == numVerts);
+	}
 
-	if (mesh_src != mesh) {
+	SimpleDeformModifier_do(sdmd, ctx->object, mesh_src, vertexCos, numVerts);
+
+	if (!ELEM(mesh_src, NULL, mesh)) {
 		BKE_id_free(NULL, mesh_src);
 	}
 }