diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_wave.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_wave.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 80ac323c82f..d5c372a2809 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -167,7 +167,7 @@ static void waveModifier_do( float mat[4][4]; /* get the control object's location in local coordinates */ invert_m4_m4(ob->imat, ob->obmat); - mul_m4_m4m4(mat, ob->imat, DEG_get_evaluated_object(ctx->depsgraph, wmd->objectcenter)->obmat); + mul_m4_m4m4(mat, ob->imat, wmd->objectcenter->obmat); wmd->startx = mat[3][0]; wmd->starty = mat[3][1]; @@ -191,7 +191,7 @@ static void waveModifier_do( } } - Tex *tex_target = (Tex *)DEG_get_evaluated_id(ctx->depsgraph, &wmd->texture->id); + Tex *tex_target = wmd->texture; if (mesh != NULL && tex_target != NULL) { tex_co = MEM_malloc_arrayN(numVerts, sizeof(*tex_co), "waveModifier_do tex_co"); MOD_get_texture_coords((MappingInfoModifierData *)wmd, ctx, ob, mesh, vertexCos, tex_co); @@ -357,12 +357,6 @@ ModifierTypeInfo modifierType_Wave = { /* copyData */ modifier_copyData_generic, - /* deformVerts_DM */ NULL, - /* deformMatrices_DM */ NULL, - /* deformVertsEM_DM */ NULL, - /* deformMatricesEM_DM*/NULL, - /* applyModifier_DM */ NULL, - /* deformVerts */ deformVerts, /* deformMatrices */ NULL, /* deformVertsEM */ deformVertsEM, @@ -379,4 +373,5 @@ ModifierTypeInfo modifierType_Wave = { /* foreachObjectLink */ foreachObjectLink, /* foreachIDLink */ foreachIDLink, /* foreachTexLink */ foreachTexLink, + /* freeRuntimeData */ NULL, }; |