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/blenkernel/intern | |
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/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_modifier.c | 13 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shader_fx.c | 12 |
3 files changed, 0 insertions, 49 deletions
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index bc74693bbb8..2eccdb872dd 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -333,10 +333,6 @@ void BKE_gpencil_modifier_free_ex(GpencilModifierData *md, const int flag) if (mti->foreachIDLink) { mti->foreachIDLink(md, NULL, modifier_free_data_id_us_cb, NULL); } - else if (mti->foreachObjectLink) { - mti->foreachObjectLink( - md, NULL, (GreasePencilObjectWalkFunc)modifier_free_data_id_us_cb, NULL); - } } if (mti->freeData) { @@ -473,10 +469,6 @@ void BKE_gpencil_modifier_copydata_ex(GpencilModifierData *md, if (mti->foreachIDLink) { mti->foreachIDLink(target, NULL, gpencil_modifier_copy_data_id_us_cb, NULL); } - else if (mti->foreachObjectLink) { - mti->foreachObjectLink( - target, NULL, (GreasePencilObjectWalkFunc)gpencil_modifier_copy_data_id_us_cb, NULL); - } } } @@ -544,11 +536,6 @@ void BKE_gpencil_modifiers_foreach_ID_link(Object *ob, GreasePencilIDWalkFunc wa if (mti->foreachIDLink) { mti->foreachIDLink(md, ob, walk, userData); } - else if (mti->foreachObjectLink) { - /* each Object can masquerade as an ID, so this should be OK */ - GreasePencilObjectWalkFunc fp = (GreasePencilObjectWalkFunc)walk; - mti->foreachObjectLink(md, ob, fp, userData); - } } } diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 6185644f5a0..abf4fc82300 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -177,9 +177,6 @@ void BKE_modifier_free_ex(ModifierData *md, const int flag) if (mti->foreachIDLink) { mti->foreachIDLink(md, NULL, modifier_free_data_id_us_cb, NULL); } - else if (mti->foreachObjectLink) { - mti->foreachObjectLink(md, NULL, (ObjectWalkFunc)modifier_free_data_id_us_cb, NULL); - } } if (mti->freeData) { @@ -278,19 +275,6 @@ void BKE_modifiers_clear_errors(Object *ob) } } -void BKE_modifiers_foreach_object_link(Object *ob, ObjectWalkFunc walk, void *userData) -{ - ModifierData *md = ob->modifiers.first; - - for (; md; md = md->next) { - const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type); - - if (mti->foreachObjectLink) { - mti->foreachObjectLink(md, ob, walk, userData); - } - } -} - void BKE_modifiers_foreach_ID_link(Object *ob, IDWalkFunc walk, void *userData) { ModifierData *md = ob->modifiers.first; @@ -301,11 +285,6 @@ void BKE_modifiers_foreach_ID_link(Object *ob, IDWalkFunc walk, void *userData) if (mti->foreachIDLink) { mti->foreachIDLink(md, ob, walk, userData); } - else if (mti->foreachObjectLink) { - /* each Object can masquerade as an ID, so this should be OK */ - ObjectWalkFunc fp = (ObjectWalkFunc)walk; - mti->foreachObjectLink(md, ob, fp, userData); - } } } @@ -374,9 +353,6 @@ void BKE_modifier_copydata_ex(ModifierData *md, ModifierData *target, const int if (mti->foreachIDLink) { mti->foreachIDLink(target, NULL, modifier_copy_data_id_us_cb, NULL); } - else if (mti->foreachObjectLink) { - mti->foreachObjectLink(target, NULL, (ObjectWalkFunc)modifier_copy_data_id_us_cb, NULL); - } } if (flag & LIB_ID_CREATE_NO_MAIN) { diff --git a/source/blender/blenkernel/intern/shader_fx.c b/source/blender/blenkernel/intern/shader_fx.c index 4ad67a1dd32..f2cdf08b415 100644 --- a/source/blender/blenkernel/intern/shader_fx.c +++ b/source/blender/blenkernel/intern/shader_fx.c @@ -116,9 +116,6 @@ void BKE_shaderfx_free_ex(ShaderFxData *fx, const int flag) if (fxi->foreachIDLink) { fxi->foreachIDLink(fx, NULL, shaderfx_free_data_id_us_cb, NULL); } - else if (fxi->foreachObjectLink) { - fxi->foreachObjectLink(fx, NULL, (ShaderFxObjectWalkFunc)shaderfx_free_data_id_us_cb, NULL); - } } if (fxi->freeData) { @@ -222,10 +219,6 @@ void BKE_shaderfx_copydata_ex(ShaderFxData *fx, ShaderFxData *target, const int if (fxi->foreachIDLink) { fxi->foreachIDLink(target, NULL, shaderfx_copy_data_id_us_cb, NULL); } - else if (fxi->foreachObjectLink) { - fxi->foreachObjectLink( - target, NULL, (ShaderFxObjectWalkFunc)shaderfx_copy_data_id_us_cb, NULL); - } } } @@ -270,11 +263,6 @@ void BKE_shaderfx_foreach_ID_link(Object *ob, ShaderFxIDWalkFunc walk, void *use if (fxi->foreachIDLink) { fxi->foreachIDLink(fx, ob, walk, userData); } - else if (fxi->foreachObjectLink) { - /* each Object can masquerade as an ID, so this should be OK */ - ShaderFxObjectWalkFunc fp = (ShaderFxObjectWalkFunc)walk; - fxi->foreachObjectLink(fx, ob, fp, userData); - } } } |