diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-29 20:02:19 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-29 20:02:19 +0300 |
| commit | 0c945288299da96decbe20df9c46dfbcc7f3891f (patch) | |
| tree | 1d3b608e5b6ad8b13d7f44b4798b015b43fcaf6a /source/blender/modifiers/intern/MOD_displace.c | |
| parent | 3bc21bc5f79aa21a63c6d545327b8e24eb9eb975 (diff) | |
Cleanup: naming in MOD_utils.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 351a496daa1..ac8fb91bc8d 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -293,14 +293,14 @@ static void displaceModifier_do( if (dmd->strength == 0.0f) return; mvert = mesh->mvert; - modifier_get_vgroup_mesh(ob, mesh, dmd->defgrp_name, &dvert, &defgrp_index); + MOD_get_vgroup(ob, mesh, dmd->defgrp_name, &dvert, &defgrp_index); if (dmd->texture) { tex_co = MEM_calloc_arrayN((size_t)numVerts, sizeof(*tex_co), "displaceModifier_do tex_co"); - get_texture_coords_mesh((MappingInfoModifierData *)dmd, ob, mesh, vertexCos, tex_co); + MOD_get_texture_coords((MappingInfoModifierData *)dmd, ob, mesh, vertexCos, tex_co); - modifier_init_texture(depsgraph, dmd->texture); + MOD_init_texture(depsgraph, dmd->texture); } else { tex_co = NULL; @@ -376,7 +376,7 @@ static void deformVerts( float (*vertexCos)[3], int numVerts) { - Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); + Mesh *mesh_src = MOD_get_mesh_eval(ctx->object, NULL, mesh, NULL, false, false); BLI_assert(mesh_src->totvert == numVerts); @@ -391,7 +391,7 @@ static void deformVertsEM( ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *editData, Mesh *mesh, float (*vertexCos)[3], int numVerts) { - Mesh *mesh_src = get_mesh(ctx->object, editData, mesh, NULL, false, false); + Mesh *mesh_src = MOD_get_mesh_eval(ctx->object, editData, mesh, NULL, false, false); BLI_assert(mesh_src->totvert == numVerts); |