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.
This commit is contained in:
parent
ede994c314
commit
15add11595
|
@ -104,8 +104,9 @@ bool BKE_shrinkwrap_init_tree(struct ShrinkwrapTreeData *data, Mesh *mesh, int s
|
|||
void BKE_shrinkwrap_free_tree(struct ShrinkwrapTreeData *data);
|
||||
|
||||
/* Implementation of the Shrinkwrap modifier */
|
||||
void shrinkwrapModifier_deform(struct ShrinkwrapModifierData *smd, struct Scene *scene, struct Object *ob, struct Mesh *mesh,
|
||||
float (*vertexCos)[3], int numVerts);
|
||||
void shrinkwrapModifier_deform(
|
||||
struct ShrinkwrapModifierData *smd, struct Scene *scene, struct Object *ob, struct Mesh *mesh,
|
||||
struct MDeformVert *dvert, const int defgrp_index, float (*vertexCos)[3], int numVerts);
|
||||
|
||||
/*
|
||||
* This function casts a ray in the given BVHTree.. but it takes into consideration the space_transform, that is:
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -105,16 +105,27 @@ static void deformVerts(
|
|||
float (*vertexCos)[3],
|
||||
int numVerts)
|
||||
{
|
||||
ShrinkwrapModifierData *swmd = (ShrinkwrapModifierData *)md;
|
||||
struct Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
|
||||
Mesh *mesh_src = mesh;
|
||||
Mesh *mesh_src = NULL;
|
||||
|
||||
if (mesh_src == NULL && ctx->object->type == OB_MESH) {
|
||||
mesh_src = ctx->object->data;
|
||||
if (ctx->object->type == OB_MESH) {
|
||||
/* mesh_src is only needed for vgroups. */
|
||||
mesh_src = MOD_get_mesh_eval(ctx->object, NULL, mesh, NULL, false, false);
|
||||
BLI_assert(mesh_src->totvert == numVerts);
|
||||
}
|
||||
|
||||
struct MDeformVert *dvert = NULL;
|
||||
int defgrp_index = -1;
|
||||
MOD_get_vgroup(ctx->object, mesh_src, swmd->vgroup_name, &dvert, &defgrp_index);
|
||||
|
||||
BLI_assert(mesh_src == NULL || mesh_src->totvert == numVerts);
|
||||
|
||||
shrinkwrapModifier_deform((ShrinkwrapModifierData *)md, scene, ctx->object, mesh_src, vertexCos, numVerts);
|
||||
shrinkwrapModifier_deform(swmd, scene, ctx->object, mesh_src, dvert, defgrp_index, vertexCos, numVerts);
|
||||
|
||||
if (!ELEM(mesh_src, NULL, mesh)) {
|
||||
BKE_id_free(NULL, mesh_src);
|
||||
}
|
||||
}
|
||||
|
||||
static void deformVertsEM(
|
||||
|
@ -122,6 +133,7 @@ static void deformVertsEM(
|
|||
struct BMEditMesh *editData, Mesh *mesh,
|
||||
float (*vertexCos)[3], int numVerts)
|
||||
{
|
||||
ShrinkwrapModifierData *swmd = (ShrinkwrapModifierData *)md;
|
||||
struct Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
|
||||
Mesh *mesh_src = mesh;
|
||||
|
||||
|
@ -131,7 +143,11 @@ static void deformVertsEM(
|
|||
|
||||
BLI_assert(mesh_src->totvert == numVerts);
|
||||
|
||||
shrinkwrapModifier_deform((ShrinkwrapModifierData *)md, scene, ctx->object, mesh_src, vertexCos, numVerts);
|
||||
struct MDeformVert *dvert = NULL;
|
||||
int defgrp_index = -1;
|
||||
MOD_get_vgroup(ctx->object, mesh_src, swmd->vgroup_name, &dvert, &defgrp_index);
|
||||
|
||||
shrinkwrapModifier_deform(swmd, scene, ctx->object, mesh_src, dvert, defgrp_index, vertexCos, numVerts);
|
||||
|
||||
if (!mesh) {
|
||||
BKE_id_free(NULL, mesh_src);
|
||||
|
|
Loading…
Reference in New Issue