diff options
author | Jacques Lucke <jacques@blender.org> | 2020-10-01 19:05:23 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-10-01 19:05:23 +0300 |
commit | ec723ad25c70994ac24b528384ee9df927a3e850 (patch) | |
tree | e1813df5859367fbaa9d5e785a0ed977bac696ca /source/blender/modifiers/intern/MOD_mask.cc | |
parent | cbbd5283a345957583eaff55752d6ec52162db88 (diff) |
remove foreachObjectLink callback
This removes `foreachObjectLink` from `ModifierTypeInfo`, `GpencilModifierTypeInfo`
and `ShaderFxTypeInfo`. There is no need to have both, `foreachObjectLink` and `foreachIDLink`.
There is not code that actually depends on `foreachObjectLink`.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D9078
Diffstat (limited to 'source/blender/modifiers/intern/MOD_mask.cc')
-rw-r--r-- | source/blender/modifiers/intern/MOD_mask.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 140a23d6ca2..78d44179ca1 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -85,10 +85,10 @@ static void requiredDataMask(Object *UNUSED(ob), r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT; } -static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData) +static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData) { MaskModifierData *mmd = reinterpret_cast<MaskModifierData *>(md); - walk(userData, ob, &mmd->ob_arm, IDWALK_CB_NOP); + walk(userData, ob, (ID **)&mmd->ob_arm, IDWALK_CB_NOP); } static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx) @@ -472,8 +472,7 @@ ModifierTypeInfo modifierType_Mask = { /* updateDepsgraph */ updateDepsgraph, /* dependsOnTime */ NULL, /* dependsOnNormals */ NULL, - /* foreachObjectLink */ foreachObjectLink, - /* foreachIDLink */ NULL, + /* foreachIDLink */ foreachIDLink, /* foreachTexLink */ NULL, /* freeRuntimeData */ NULL, /* panelRegister */ panelRegister, |