archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix bad pointer cast when modifier is used on non-mesh object

Browse Source
This commit is contained in:
Sybren A. Stüvel
2018-05-09 17:37:54 +02:00
parent b726ff4fc4
commit 4fe5a105f6
8 changed files with 61 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/modifiers/intern/MOD_hook.c
View File

@@ -352,9 +352,13 @@ static void deformVerts(struct ModifierData *md, const struct ModifierEvalContex
float (*vertexCos)[3], int numVerts)
{
HookModifierData *hmd = (HookModifierData *)md;
Mesh *mesh_src = mesh ? mesh : ctx->object->data;
Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false);
deformVerts_do(hmd, ctx->object, mesh_src, vertexCos, numVerts);
if (mesh_src != mesh) {
BKE_id_free(NULL, mesh_src);
}
}
static void deformVertsEM(struct ModifierData *md, const struct ModifierEvalContext *ctx,
@@ -362,10 +366,7 @@ static void deformVertsEM(struct ModifierData *md, const struct ModifierEvalCont
struct Mesh *mesh, float (*vertexCos)[3], int numVerts)
{
HookModifierData *hmd = (HookModifierData *)md;
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);
deformVerts_do(hmd, ctx->object, mesh_src, vertexCos, numVerts);