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_uvproject.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_uvproject.c')
-rw-r--r--source/blender/modifiers/intern/MOD_uvproject.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c
index 66d408a7e4d..bfbc27abb88 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -75,23 +75,12 @@ static void requiredDataMask(Object *UNUSED(ob),
r_cddata_masks->lmask |= CD_MLOOPUV;
}
-static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData)
-{
- UVProjectModifierData *umd = (UVProjectModifierData *)md;
- int i;
-
- for (i = 0; i < MOD_UVPROJECT_MAXPROJECTORS; i++) {
- walk(userData, ob, &umd->projectors[i], IDWALK_CB_NOP);
- }
-}
-
static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
{
-#if 0
UVProjectModifierData *umd = (UVProjectModifierData *)md;
-#endif
-
- foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
+ for (int i = 0; i < MOD_UVPROJECT_MAXPROJECTORS; i++) {
+ walk(userData, ob, (ID **)&umd->projectors[i], IDWALK_CB_NOP);
+ }
}
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
@@ -391,7 +380,6 @@ ModifierTypeInfo modifierType_UVProject = {
/* updateDepsgraph */ updateDepsgraph,
/* dependsOnTime */ NULL,
/* dependsOnNormals */ NULL,
- /* foreachObjectLink */ foreachObjectLink,
/* foreachIDLink */ foreachIDLink,
/* foreachTexLink */ NULL,
/* freeRuntimeData */ NULL,