From 8f22feefbc2014154ea59da24b43ff316c5e1d17 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 3 Aug 2020 17:52:53 +1000 Subject: Fix T79440: Deform modifiers fail in edit-mode when not first Lattice, armature & curve only worked when an edit-mesh was passed in, the mesh argument was being ignored. Regression in 9f5833798caf9 --- source/blender/modifiers/intern/MOD_armature.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/modifiers/intern/MOD_armature.c') diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index b62c03d1b03..e7f47a09d95 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -165,10 +165,15 @@ static void deformVerts(ModifierData *md, static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *em, - Mesh *UNUSED(mesh), + Mesh *mesh, float (*vertexCos)[3], int numVerts) { + if (mesh != NULL) { + deformVerts(md, ctx, mesh, vertexCos, numVerts); + return; + } + ArmatureModifierData *amd = (ArmatureModifierData *)md; MOD_previous_vcos_store(md, vertexCos); /* if next modifier needs original vertices */ -- cgit v1.2.3