Cleanup: Remove unused argument from modifier data mask callback
This isn't likely to be helpful in the future with the move to generic attributes
This commit is contained in:
parent
e22198b8d1
commit
6d4d74172b
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -68,9 +68,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
tamd->vert_coords_prev = NULL;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *UNUSED(md),
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
/* ask for vertexgroups */
|
||||
r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
|
||||
|
|
|
@ -64,9 +64,7 @@ static void copyData(const ModifierData *md_src, ModifierData *md_dst, const int
|
|||
bmd_dst->custom_profile = BKE_curveprofile_copy(bmd_src->custom_profile);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
BevelModifierData *bmd = (BevelModifierData *)md;
|
||||
|
||||
|
|
|
@ -570,9 +570,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
|
|||
return result;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *UNUSED(md),
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
|
||||
r_cddata_masks->emask |= CD_MASK_MEDGE;
|
||||
|
|
|
@ -63,9 +63,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
|
|||
return false;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
CastModifierData *cmd = (CastModifierData *)md;
|
||||
|
||||
|
|
|
@ -147,9 +147,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_depends_on_transform_relation(ctx->node, "Cloth Modifier");
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
ClothModifierData *clmd = (ClothModifierData *)md;
|
||||
|
||||
|
|
|
@ -96,9 +96,7 @@ static void freeData(ModifierData *md)
|
|||
freeBind(csmd);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md;
|
||||
|
||||
|
|
|
@ -51,9 +51,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(cmd, DNA_struct_default_get(CurveModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
CurveModifierData *cmd = (CurveModifierData *)md;
|
||||
|
||||
|
|
|
@ -73,9 +73,7 @@ static void initData(ModifierData *md)
|
|||
dtmd->flags = MOD_DATATRANSFER_OBSRC_TRANSFORM;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
DataTransferModifierData *dtmd = (DataTransferModifierData *)md;
|
||||
|
||||
|
|
|
@ -54,9 +54,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(dmd, DNA_struct_default_get(DecimateModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
DecimateModifierData *dmd = (DecimateModifierData *)md;
|
||||
|
||||
|
|
|
@ -59,9 +59,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(dmd, DNA_struct_default_get(DisplaceModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
DisplaceModifierData *dmd = (DisplaceModifierData *)md;
|
||||
|
||||
|
|
|
@ -74,9 +74,7 @@ static void freeData(ModifierData *md)
|
|||
dynamicPaint_Modifier_free(pmd);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
|
||||
|
||||
|
|
|
@ -76,9 +76,7 @@ static bool dependsOnTime(struct Scene *UNUSED(scene), ModifierData *UNUSED(md))
|
|||
{
|
||||
return true;
|
||||
}
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
ExplodeModifierData *emd = (ExplodeModifierData *)md;
|
||||
|
||||
|
|
|
@ -78,9 +78,7 @@ static void freeData(ModifierData *md)
|
|||
#endif /* WITH_FLUID */
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
FluidModifierData *fmd = (FluidModifierData *)md;
|
||||
|
||||
|
|
|
@ -68,9 +68,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
thmd->indexar = MEM_dupallocN(hmd->indexar);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
HookModifierData *hmd = (HookModifierData *)md;
|
||||
|
||||
|
|
|
@ -747,9 +747,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
|
|||
return 1;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md;
|
||||
|
||||
|
|
|
@ -511,9 +511,7 @@ static bool is_disabled(const struct Scene *UNUSED(scene),
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void required_data_mask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void required_data_mask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
LaplacianSmoothModifierData *smd = (LaplacianSmoothModifierData *)md;
|
||||
|
||||
|
|
|
@ -47,9 +47,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(lmd, DNA_struct_default_get(LatticeModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
LatticeModifierData *lmd = (LatticeModifierData *)md;
|
||||
|
||||
|
|
|
@ -64,9 +64,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(mmd, DNA_struct_default_get(MaskModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *UNUSED(md),
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
|
||||
}
|
||||
|
|
|
@ -119,9 +119,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
}
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
MeshDeformModifierData *mmd = (MeshDeformModifierData *)md;
|
||||
|
||||
|
|
|
@ -62,9 +62,7 @@ static void initData(ModifierData *md)
|
|||
md->ui_expand_flag = UI_PANEL_DATA_EXPAND_ROOT | UI_SUBPANEL_DATA_EXPAND_1;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
MultiresModifierData *mmd = (MultiresModifierData *)md;
|
||||
if (mmd->flags & eMultiresModifierFlag_UseCustomNormals) {
|
||||
|
|
|
@ -1886,9 +1886,7 @@ static void freeData(ModifierData *md)
|
|||
clear_runtime_data(nmd);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *UNUSED(md),
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
/* We don't know what the node tree will need. If there are vertex groups, it is likely that the
|
||||
* node tree wants to access them. */
|
||||
|
|
|
@ -630,9 +630,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(enmd, DNA_struct_default_get(NormalEditModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
NormalEditModifierData *enmd = (NormalEditModifierData *)md;
|
||||
|
||||
|
|
|
@ -130,9 +130,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
}
|
||||
|
||||
#ifdef WITH_OCEANSIM
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
OceanModifierData *omd = (OceanModifierData *)md;
|
||||
|
||||
|
@ -141,8 +139,7 @@ static void requiredDataMask(Object *UNUSED(ob),
|
|||
}
|
||||
}
|
||||
#else /* WITH_OCEANSIM */
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *UNUSED(md),
|
||||
static void requiredDataMask(ModifierData *UNUSED(md),
|
||||
CustomData_MeshMasks *UNUSED(r_cddata_masks))
|
||||
{
|
||||
}
|
||||
|
|
|
@ -52,9 +52,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(pimd, DNA_struct_default_get(ParticleInstanceModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *)md;
|
||||
|
||||
|
|
|
@ -87,9 +87,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
tpsmd->totdmvert = tpsmd->totdmedge = tpsmd->totdmface = 0;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
ParticleSystemModifierData *psmd = (ParticleSystemModifierData *)md;
|
||||
|
||||
|
|
|
@ -48,9 +48,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(smd, DNA_struct_default_get(ShrinkwrapModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md;
|
||||
|
||||
|
|
|
@ -414,9 +414,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(smd, DNA_struct_default_get(SimpleDeformModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md;
|
||||
|
||||
|
|
|
@ -2007,9 +2007,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
|
|||
return result;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *UNUSED(md),
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
r_cddata_masks->vmask |= CD_MASK_MVERT_SKIN | CD_MASK_MDEFORMVERT;
|
||||
}
|
||||
|
|
|
@ -63,9 +63,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
|
|||
return false;
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
SmoothModifierData *smd = (SmoothModifierData *)md;
|
||||
|
||||
|
|
|
@ -53,9 +53,7 @@ static void initData(ModifierData *md)
|
|||
# pragma GCC diagnostic error "-Wsign-conversion"
|
||||
#endif
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
SolidifyModifierData *smd = (SolidifyModifierData *)md;
|
||||
|
||||
|
|
|
@ -61,9 +61,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(smd, DNA_struct_default_get(SubsurfModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
SubsurfModifierData *smd = (SubsurfModifierData *)md;
|
||||
if (smd->flags & eSubsurfModifierFlag_UseCustomNormals) {
|
||||
|
|
|
@ -192,9 +192,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(smd, DNA_struct_default_get(SurfaceDeformModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md;
|
||||
|
||||
|
|
|
@ -52,9 +52,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(umd, DNA_struct_default_get(UVProjectModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *UNUSED(md),
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
/* ask for UV coordinates */
|
||||
r_cddata_masks->lmask |= CD_MASK_MLOOPUV;
|
||||
|
|
|
@ -58,9 +58,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(umd, DNA_struct_default_get(UVWarpModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
UVWarpModifierData *umd = (UVWarpModifierData *)md;
|
||||
|
||||
|
|
|
@ -70,9 +70,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
twmd->curfalloff = BKE_curvemapping_copy(wmd->curfalloff);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WarpModifierData *wmd = (WarpModifierData *)md;
|
||||
|
||||
|
|
|
@ -102,9 +102,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WaveModifierData *wmd = (WaveModifierData *)md;
|
||||
|
||||
|
|
|
@ -674,9 +674,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(wnmd, DNA_struct_default_get(WeightedNormalModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WeightedNormalModifierData *wnmd = (WeightedNormalModifierData *)md;
|
||||
|
||||
|
|
|
@ -81,9 +81,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
twmd->cmap_curve = BKE_curvemapping_copy(wmd->cmap_curve);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md;
|
||||
|
||||
|
|
|
@ -129,9 +129,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(wmd, DNA_struct_default_get(WeightVGMixModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *)md;
|
||||
|
||||
|
|
|
@ -330,9 +330,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
|
|||
twmd->cmap_curve = BKE_curvemapping_copy(wmd->cmap_curve);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *)md;
|
||||
|
||||
|
|
|
@ -147,9 +147,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(wmd, DNA_struct_default_get(WeldModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WeldModifierData *wmd = (WeldModifierData *)md;
|
||||
|
||||
|
|
|
@ -41,9 +41,7 @@ static void initData(ModifierData *md)
|
|||
MEMCPY_STRUCT_AFTER(wmd, DNA_struct_default_get(WireframeModifierData), modifier);
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
ModifierData *md,
|
||||
CustomData_MeshMasks *r_cddata_masks)
|
||||
static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
|
||||
{
|
||||
WireframeModifierData *wmd = (WireframeModifierData *)md;
|
||||
|
||||
|
|
Loading…
Reference in New Issue