diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-26 22:43:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-26 23:07:50 +0300 |
| commit | 15add11595fcefae604ec6980bcd840e3705232a (patch) | |
| tree | 2768b3e8f087737b134dc5552f87ed5e8976d8d5 /source/blender/blenkernel/intern/shrinkwrap.c | |
| parent | ede994c3140b92076a3f398b6889e02231461150 (diff) | |
MOD_shrinkwrap: do not compute mesh when not needed.
This modifier only uses mesh to get vgroup, which is only needed in case
modified object is indeed a mesh! Building a mesh from curve here is not
only useless and time-consuming, it will also easily fail the assert
about same number of vertices!
Note that surface_project and subsurf option also need more work at some
point, but this is probably not that urgent for now.
Also, use MOD_get_vgroup() helper in modifier code itself and pass
resulting MDeformVert & index to BKE_shrinkwrap's `shrinkwrapModifier_deform()`,
this is simpler and avoids duplicating vgroup handling code.
Related to T57972.
Diffstat (limited to 'source/blender/blenkernel/intern/shrinkwrap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 0da60b92f4b..d9cb7e72a72 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -1281,7 +1281,7 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) /* Main shrinkwrap function */ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, struct Scene *scene, Object *ob, Mesh *mesh, - float (*vertexCos)[3], int numVerts) + MDeformVert *dvert, const int defgrp_index, float (*vertexCos)[3], int numVerts) { DerivedMesh *ss_mesh = NULL; @@ -1298,18 +1298,10 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, struct Scene *scene, calc.ob = ob; calc.numVerts = numVerts; calc.vertexCos = vertexCos; + calc.dvert = dvert; + calc.vgroup = defgrp_index; calc.invert_vgroup = (smd->shrinkOpts & MOD_SHRINKWRAP_INVERT_VGROUP) != 0; - /* DeformVertex */ - calc.vgroup = defgroup_name_index(calc.ob, calc.smd->vgroup_name); - if (mesh) { - calc.dvert = mesh->dvert; - } - else if (calc.ob->type == OB_LATTICE) { - calc.dvert = BKE_lattice_deform_verts_get(calc.ob); - } - - if (smd->target) { calc.target = BKE_modifier_get_evaluated_mesh_from_evaluated_object(smd->target, &target_free); @@ -1322,14 +1314,9 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, struct Scene *scene, calc.keepDist = smd->keepDist; } - - - calc.vgroup = defgroup_name_index(calc.ob, smd->vgroup_name); - if (mesh != NULL && smd->shrinkType == MOD_SHRINKWRAP_PROJECT) { /* Setup arrays to get vertexs positions, normals and deform weights */ - calc.vert = mesh->mvert; - calc.dvert = mesh->dvert; + calc.vert = mesh->mvert; /* Using vertexs positions/normals as if a subsurface was applied */ if (smd->subsurfLevels) { |