diff options
author | Hans Goudey <h.goudey@me.com> | 2022-04-21 20:02:13 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-04-21 20:02:13 +0300 |
commit | 9a9a46df469b136f5b6c82bdfbbbc70d95066893 (patch) | |
tree | d86fc2461b11c95ee73d7609b61c278caa9cca7c /source | |
parent | e2d8b6dc0633807b0f6864d6d0972e702813c33e (diff) |
Cleanup: Remove unused argument to mesh modifier evaluation
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.cc | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 4b4507a425f..8a0ad4b724b 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -734,7 +734,6 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph, const bool use_deform, const bool need_mapping, const CustomData_MeshMasks *dataMask, - const int index, const bool use_cache, const bool allow_shared_mesh, /* return args */ @@ -848,12 +847,6 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph, else { break; } - - /* grab modifiers until index i */ - if ((index != -1) && (BLI_findindex(&ob->modifiers, md) >= index)) { - md = nullptr; - break; - } } /* Result of all leading deforming modifiers is cached for @@ -1129,11 +1122,6 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph, isPrevDeform = (mti->type == eModifierTypeType_OnlyDeform); - /* grab modifiers until index i */ - if ((index != -1) && (BLI_findindex(&ob->modifiers, md) >= index)) { - break; - } - if (sculpt_mode && md->type == eModifierType_Multires) { multires_applied = true; } @@ -1611,7 +1599,7 @@ static void mesh_build_data(struct Depsgraph *depsgraph, const CustomData_MeshMasks *dataMask, const bool need_mapping) { -#if 0 /* XXX This is already taken care of in mesh_calc_modifiers()... */ +#if 0 /* XXX This is already taken care of in #mesh_calc_modifiers... */ if (need_mapping) { /* Also add the flag so that it is recorded in lastDataMask. */ dataMask->vmask |= CD_MASK_ORIGINDEX; @@ -1628,7 +1616,6 @@ static void mesh_build_data(struct Depsgraph *depsgraph, true, need_mapping, dataMask, - -1, true, true, &mesh_deform_eval, @@ -1882,7 +1869,7 @@ Mesh *mesh_create_eval_final(Depsgraph *depsgraph, { Mesh *result; mesh_calc_modifiers( - depsgraph, scene, ob, true, false, dataMask, -1, false, false, nullptr, &result, nullptr); + depsgraph, scene, ob, true, false, dataMask, false, false, nullptr, &result, nullptr); return result; } @@ -1893,7 +1880,7 @@ Mesh *mesh_create_eval_no_deform(Depsgraph *depsgraph, { Mesh *result; mesh_calc_modifiers( - depsgraph, scene, ob, false, false, dataMask, -1, false, false, nullptr, &result, nullptr); + depsgraph, scene, ob, false, false, dataMask, false, false, nullptr, &result, nullptr); return result; } @@ -1904,7 +1891,7 @@ Mesh *mesh_create_eval_no_deform_render(Depsgraph *depsgraph, { Mesh *result; mesh_calc_modifiers( - depsgraph, scene, ob, false, false, dataMask, -1, false, false, nullptr, &result, nullptr); + depsgraph, scene, ob, false, false, dataMask, false, false, nullptr, &result, nullptr); return result; } |