diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-09 18:37:54 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-11 11:14:35 +0300 |
| commit | 4fe5a105f6da5131396f93658389103475d89b09 (patch) | |
| tree | ed87289dd29c2d597d79d6ab80f5c65c603005e9 /source/blender/modifiers/intern/MOD_armature.c | |
| parent | b726ff4fc4175e1921d7cf6758a7fbb0e4e90576 (diff) | |
Fix bad pointer cast when modifier is used on non-mesh object
Diffstat (limited to 'source/blender/modifiers/intern/MOD_armature.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index fc077a4ca61..26fe2ff2e4c 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -135,11 +135,7 @@ static void deformVertsEM( Mesh *mesh, float (*vertexCos)[3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - Mesh *mesh_src = mesh; - - if (!mesh) { - mesh_src = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0}); - } + Mesh *mesh_src = get_mesh(ctx->object, em, mesh, NULL, false, false); modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ @@ -152,7 +148,7 @@ static void deformVertsEM( amd->prevCos = NULL; } - if (!mesh) { + if (mesh_src != mesh) { BKE_id_free(NULL, mesh_src); } } @@ -163,16 +159,12 @@ static void deformMatricesEM( float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - Mesh *mesh_src = mesh; - - if (!mesh) { - mesh_src = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0}); - } + Mesh *mesh_src = get_mesh(ctx->object, em, mesh, NULL, false, false); armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); - if (!mesh) { + if (mesh_src != mesh) { BKE_id_free(NULL, mesh_src); } } @@ -181,10 +173,14 @@ static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, Mes float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - Mesh *mesh_src = mesh ? mesh : ctx->object->data; + Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); + + if (mesh_src != mesh) { + BKE_id_free(NULL, mesh_src); + } } ModifierTypeInfo modifierType_Armature = { |