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_simpledeform.c | |
| parent | b726ff4fc4175e1921d7cf6758a7fbb0e4e90576 (diff) | |
Fix bad pointer cast when modifier is used on non-mesh object
Diffstat (limited to 'source/blender/modifiers/intern/MOD_simpledeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_simpledeform.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 4e9b5b20871..f054c89ea90 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -42,6 +42,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_editmesh.h" #include "BKE_mesh.h" +#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_modifier.h" #include "BKE_deform.h" @@ -383,8 +384,13 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, float (*vertexCos)[3], int numVerts) { - Mesh *mesh_src = mesh ? mesh : ctx->object->data; + Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); + SimpleDeformModifier_do((SimpleDeformModifierData *)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, @@ -393,11 +399,13 @@ static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, float (*vertexCos)[3], int numVerts) { - Mesh *mesh_src = mesh; - if (!mesh) { - mesh_src = BKE_bmesh_to_mesh_nomain(editData->bm, &(struct BMeshToMeshParams){0}); - } + Mesh *mesh_src = get_mesh(ctx->object, editData, mesh, NULL, false, false); + SimpleDeformModifier_do((SimpleDeformModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts); + + if (mesh_src != mesh) { + BKE_id_free(NULL, mesh_src); + } } |