Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-10-01 19:05:23 +0300
committerJacques Lucke <jacques@blender.org>2020-10-01 19:05:23 +0300
commitec723ad25c70994ac24b528384ee9df927a3e850 (patch)
treee1813df5859367fbaa9d5e785a0ed977bac696ca /source/blender/modifiers/intern/MOD_shrinkwrap.c
parentcbbd5283a345957583eaff55752d6ec52162db88 (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_shrinkwrap.c')
-rw-r--r--source/blender/modifiers/intern/MOD_shrinkwrap.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index 14014eab965..dddabb12f61 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -101,12 +101,12 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
return false;
}
-static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData)
+static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
{
ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md;
- walk(userData, ob, &smd->target, IDWALK_CB_NOP);
- walk(userData, ob, &smd->auxTarget, IDWALK_CB_NOP);
+ walk(userData, ob, (ID **)&smd->target, IDWALK_CB_NOP);
+ walk(userData, ob, (ID **)&smd->auxTarget, IDWALK_CB_NOP);
}
static void deformVerts(ModifierData *md,
@@ -302,8 +302,7 @@ ModifierTypeInfo modifierType_Shrinkwrap = {
/* updateDepsgraph */ updateDepsgraph,
/* dependsOnTime */ NULL,
/* dependsOnNormals */ dependsOnNormals,
- /* foreachObjectLink */ foreachObjectLink,
- /* foreachIDLink */ NULL,
+ /* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,
/* panelRegister */ panelRegister,