diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.cc | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/crazyspace.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 3 |
4 files changed, 8 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index cda1fd01e44..f46672a5033 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -265,9 +265,7 @@ typedef struct ModifierTypeInfo { * * This function is optional. */ - void (*requiredDataMask)(struct Object *ob, - struct ModifierData *md, - struct CustomData_MeshMasks *r_cddata_masks); + void (*requiredDataMask)(struct ModifierData *md, struct CustomData_MeshMasks *r_cddata_masks); /** * Free internal modifier data variables, this function should @@ -521,7 +519,6 @@ typedef struct CDMaskLink { * final_datamask is required at the end of the stack. */ struct CDMaskLink *BKE_modifier_calc_data_masks(const struct Scene *scene, - struct Object *ob, struct ModifierData *md, struct CustomData_MeshMasks *final_datamask, int required_mode, diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 0d07ea428bc..9c05a2c4061 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -731,7 +731,7 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph, * subdividing them is expensive. */ CustomData_MeshMasks final_datamask = *dataMask; CDMaskLink *datamasks = BKE_modifier_calc_data_masks( - scene, ob, md, &final_datamask, required_mode, previewmd, &previewmask); + scene, md, &final_datamask, required_mode, previewmd, &previewmask); CDMaskLink *md_datamask = datamasks; /* XXX Always copying POLYINDEX, else tessellated data are no more valid! */ CustomData_MeshMasks append_mask = CD_MASK_BAREMESH_ORIGINDEX; @@ -852,7 +852,7 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph, /* Add orco mesh as layer if needed by this modifier. */ if (mesh_final && mesh_orco && mti->requiredDataMask) { CustomData_MeshMasks mask = {0}; - mti->requiredDataMask(ob, md, &mask); + mti->requiredDataMask(md, &mask); if (mask.vmask & CD_MASK_ORCO) { add_orco_mesh(ob, nullptr, mesh_final, mesh_orco, CD_ORCO); } @@ -1003,7 +1003,7 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph, temp_cddata_masks.pmask = CD_MASK_ORIGINDEX; if (mti->requiredDataMask != nullptr) { - mti->requiredDataMask(ob, md, &temp_cddata_masks); + mti->requiredDataMask(md, &temp_cddata_masks); } CustomData_MeshMasks_update(&temp_cddata_masks, &nextmask); mesh_set_only_copy(mesh_orco, &temp_cddata_masks); @@ -1298,7 +1298,7 @@ static void editbmesh_calc_modifiers(struct Depsgraph *depsgraph, * subdividing them is expensive. */ CustomData_MeshMasks final_datamask = *dataMask; CDMaskLink *datamasks = BKE_modifier_calc_data_masks( - scene, ob, md, &final_datamask, required_mode, nullptr, nullptr); + scene, md, &final_datamask, required_mode, nullptr, nullptr); CDMaskLink *md_datamask = datamasks; CustomData_MeshMasks append_mask = CD_MASK_BAREMESH; @@ -1328,7 +1328,7 @@ static void editbmesh_calc_modifiers(struct Depsgraph *depsgraph, /* Add an orco mesh as layer if needed by this modifier. */ if (mesh_final && mesh_orco && mti->requiredDataMask) { CustomData_MeshMasks mask = {0}; - mti->requiredDataMask(ob, md, &mask); + mti->requiredDataMask(md, &mask); if (mask.vmask & CD_MASK_ORCO) { add_orco_mesh(ob, em_input, mesh_final, mesh_orco, CD_ORCO); } diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc index 7f1179d0804..190e2d3bb7e 100644 --- a/source/blender/blenkernel/intern/crazyspace.cc +++ b/source/blender/blenkernel/intern/crazyspace.cc @@ -268,7 +268,7 @@ int BKE_crazyspace_get_first_deform_matrices_editbmesh(struct Depsgraph *depsgra const int required_mode = eModifierMode_Realtime | eModifierMode_Editmode; CustomData_MeshMasks cd_mask_extra = CD_MASK_BAREMESH; CDMaskLink *datamasks = BKE_modifier_calc_data_masks( - scene, ob, md, &cd_mask_extra, required_mode, nullptr, nullptr); + scene, md, &cd_mask_extra, required_mode, nullptr, nullptr); cd_mask_extra = datamasks->mask; BLI_linklist_free((LinkNode *)datamasks, nullptr); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 60d6b51594a..ba84b27bf31 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -603,7 +603,6 @@ bool BKE_modifier_is_nonlocal_in_liboverride(const Object *ob, const ModifierDat } CDMaskLink *BKE_modifier_calc_data_masks(const struct Scene *scene, - Object *ob, ModifierData *md, CustomData_MeshMasks *final_datamask, int required_mode, @@ -626,7 +625,7 @@ CDMaskLink *BKE_modifier_calc_data_masks(const struct Scene *scene, } if (mti->requiredDataMask) { - mti->requiredDataMask(ob, md, &curr->mask); + mti->requiredDataMask(md, &curr->mask); } if (previewmd == md && previewmask != NULL) { |