Commit: 22c962aa291417b518dab4cffea65fc36b65019b Author: Sybren A. Stüvel Date: Fri May 11 10:07:30 2018 +0200 Branches: temp-sybren-modifier-nonmesh https://developer.blender.org/rB22c962aa291417b518dab4cffea65fc36b65019b
Some more tweaks =================================================================== M source/blender/modifiers/intern/MOD_displace.c M source/blender/modifiers/intern/MOD_hook.c =================================================================== diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index c28bb41647f..853787245a4 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -367,33 +367,29 @@ static void deformVerts( float (*vertexCos)[3], int numVerts) { - Mesh *mesh_src = mesh; - - if (mesh_src == NULL) { - mesh_src = ctx->object->data; - } + Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); BLI_assert(mesh_src->totvert == numVerts); displaceModifier_do((DisplaceModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts); + + if (mesh_src != mesh) { + BKE_id_free(NULL, mesh_src); + } } static void deformVertsEM( ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *editData, Mesh *mesh, float (*vertexCos)[3], int numVerts) { - Mesh *mesh_src = mesh; - - if (mesh_src == NULL) { - mesh_src = BKE_bmesh_to_mesh_nomain(editData->bm, &(struct BMeshToMeshParams){0}); - } + Mesh *mesh_src = get_mesh(ctx->object, editData, mesh, NULL, false, false); BLI_assert(mesh_src->totvert == numVerts); displaceModifier_do((DisplaceModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts); - if (!mesh) { + if (mesh_src != mesh) { BKE_id_free(NULL, mesh_src); } } diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 29462db7adf..0a2510ba2be 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -354,7 +354,7 @@ static void deformVerts(struct ModifierData *md, const struct ModifierEvalContex HookModifierData *hmd = (HookModifierData *)md; Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); - deformVerts_do(hmd, ctx->object, mesh_src, NULL, numVerts); + deformVerts_do(hmd, ctx->object, mesh_src, vertexCos, numVerts); if (mesh_src != mesh) { BKE_id_free(NULL, mesh_src); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs