diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-08-24 18:39:52 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-08-24 20:19:13 +0300 |
| commit | de29ddebfc972cbf4b5a63eb9b39b2d4a4ff6abe (patch) | |
| tree | 17eeea43f602384bd49edd184578134dbf01f456 /source/blender/modifiers/intern/MOD_shrinkwrap.c | |
| parent | fb017506dabc17490aa2251c2b3802a975959240 (diff) | |
| parent | fc26e3fe19e6eebf21bb436bab4e440bcf8a6615 (diff) | |
Merge branch 'master' into refactor-mesh-remove-pointers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shrinkwrap.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_shrinkwrap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index e6f7b0bad48..cd36d82e746 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -108,7 +108,7 @@ static void deformVerts(ModifierData *md, (swmd->shrinkType == MOD_SHRINKWRAP_PROJECT)) { /* mesh_src is needed for vgroups, but also used as ShrinkwrapCalcData.vert when projecting. * Avoid time-consuming mesh conversion for curves when not projecting. */ - mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, verts_num, false, false); + mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, verts_num, false); } const MDeformVert *dvert = NULL; @@ -135,8 +135,7 @@ static void deformVertsEM(ModifierData *md, Mesh *mesh_src = NULL; if ((swmd->vgroup_name[0] != '\0') || (swmd->shrinkType == MOD_SHRINKWRAP_PROJECT)) { - mesh_src = MOD_deform_mesh_eval_get( - ctx->object, editData, mesh, NULL, verts_num, false, false); + mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, NULL, verts_num, false); } /* TODO(@campbellbarton): use edit-mode data only (remove this line). */ |