diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-18 06:14:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-18 06:21:40 +0300 |
commit | 82c51d0edbab45f014b4d0b4c0a96c000c46e232 (patch) | |
tree | 82defd9936bc71862351e1d336194377b2946d48 /source/blender/modifiers/intern/MOD_cast.c | |
parent | 7ba403dc94c3adb06807994043559f157c9984c7 (diff) |
Modifier: skip calling MOD_deform_mesh_eval_get
This is only needed in certain cases.
When testing performance improvements to the modifier stack
it's useful to bypass this function.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_cast.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_cast.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index b562152d906..ed4a53ba2f3 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -153,7 +153,9 @@ static void sphere_do(CastModifierData *cmd, /* 3) if we were given a vertex group name, * only those vertices should be affected */ - MOD_get_vgroup(ob, mesh, cmd->defgrp_name, &dvert, &defgrp_index); + if (cmd->defgrp_name[0] != '\0') { + MOD_get_vgroup(ob, mesh, cmd->defgrp_name, &dvert, &defgrp_index); + } if (flag & MOD_CAST_SIZE_FROM_RADIUS) { len = cmd->radius; @@ -244,11 +246,12 @@ static void cuboid_do(CastModifierData *cmd, int numVerts) { MDeformVert *dvert = NULL; + int defgrp_index; const bool invert_vgroup = (cmd->flag & MOD_CAST_INVERT_VGROUP) != 0; Object *ctrl_ob = NULL; - int i, defgrp_index; + int i; bool has_radius = false; short flag; float fac = cmd->fac; @@ -273,7 +276,9 @@ static void cuboid_do(CastModifierData *cmd, /* 3) if we were given a vertex group name, * only those vertices should be affected */ - MOD_get_vgroup(ob, mesh, cmd->defgrp_name, &dvert, &defgrp_index); + if (cmd->defgrp_name[0] != '\0') { + MOD_get_vgroup(ob, mesh, cmd->defgrp_name, &dvert, &defgrp_index); + } if (ctrl_ob) { if (flag & MOD_CAST_USE_OB_TRANSFORM) { @@ -491,10 +496,15 @@ static void deformVertsEM(ModifierData *md, int numVerts) { CastModifierData *cmd = (CastModifierData *)md; - Mesh *mesh_src = MOD_deform_mesh_eval_get( - ctx->object, editData, mesh, NULL, numVerts, false, false); + Mesh *mesh_src = NULL; - BLI_assert(mesh_src->totvert == numVerts); + if (cmd->defgrp_name[0] != '\0') { + mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, NULL, numVerts, false, false); + } + + if (mesh_src) { + BLI_assert(mesh_src->totvert == numVerts); + } if (cmd->type == MOD_CAST_TYPE_CUBOID) { cuboid_do(cmd, ctx, ctx->object, mesh_src, vertexCos, numVerts); |