From ec723ad25c70994ac24b528384ee9df927a3e850 Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Thu, 1 Oct 2020 18:05:23 +0200
Subject: 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
---
 source/blender/shader_fx/intern/FX_shader_blur.c     |  1 -
 source/blender/shader_fx/intern/FX_shader_colorize.c |  1 -
 source/blender/shader_fx/intern/FX_shader_flip.c     |  1 -
 source/blender/shader_fx/intern/FX_shader_glow.c     |  1 -
 source/blender/shader_fx/intern/FX_shader_pixel.c    |  1 -
 source/blender/shader_fx/intern/FX_shader_rim.c      |  1 -
 source/blender/shader_fx/intern/FX_shader_shadow.c   | 10 +++-------
 source/blender/shader_fx/intern/FX_shader_swirl.c    | 10 +++-------
 source/blender/shader_fx/intern/FX_shader_wave.c     |  1 -
 9 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'source/blender/shader_fx/intern')

diff --git a/source/blender/shader_fx/intern/FX_shader_blur.c b/source/blender/shader_fx/intern/FX_shader_blur.c
index ca3028e1ac2..dee9542edc4 100644
--- a/source/blender/shader_fx/intern/FX_shader_blur.c
+++ b/source/blender/shader_fx/intern/FX_shader_blur.c
@@ -93,7 +93,6 @@ ShaderFxTypeInfo shaderfx_Type_Blur = {
     /* isDisabled */ NULL,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.c b/source/blender/shader_fx/intern/FX_shader_colorize.c
index 8dfe2158019..1d4f1ca4de8 100644
--- a/source/blender/shader_fx/intern/FX_shader_colorize.c
+++ b/source/blender/shader_fx/intern/FX_shader_colorize.c
@@ -100,7 +100,6 @@ ShaderFxTypeInfo shaderfx_Type_Colorize = {
     /* isDisabled */ NULL,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_flip.c b/source/blender/shader_fx/intern/FX_shader_flip.c
index 65ac87770b1..b6a36378f7e 100644
--- a/source/blender/shader_fx/intern/FX_shader_flip.c
+++ b/source/blender/shader_fx/intern/FX_shader_flip.c
@@ -90,7 +90,6 @@ ShaderFxTypeInfo shaderfx_Type_Flip = {
     /* isDisabled */ NULL,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_glow.c b/source/blender/shader_fx/intern/FX_shader_glow.c
index fb004f1bb1e..30eaa35a049 100644
--- a/source/blender/shader_fx/intern/FX_shader_glow.c
+++ b/source/blender/shader_fx/intern/FX_shader_glow.c
@@ -110,7 +110,6 @@ ShaderFxTypeInfo shaderfx_Type_Glow = {
     /* isDisabled */ NULL,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.c b/source/blender/shader_fx/intern/FX_shader_pixel.c
index 7e5a89e8c7d..2a54425aa9d 100644
--- a/source/blender/shader_fx/intern/FX_shader_pixel.c
+++ b/source/blender/shader_fx/intern/FX_shader_pixel.c
@@ -91,7 +91,6 @@ ShaderFxTypeInfo shaderfx_Type_Pixel = {
     /* isDisabled */ NULL,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_rim.c b/source/blender/shader_fx/intern/FX_shader_rim.c
index f22469e68fe..a10211c3aa4 100644
--- a/source/blender/shader_fx/intern/FX_shader_rim.c
+++ b/source/blender/shader_fx/intern/FX_shader_rim.c
@@ -118,7 +118,6 @@ ShaderFxTypeInfo shaderfx_Type_Rim = {
     /* isDisabled */ NULL,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.c b/source/blender/shader_fx/intern/FX_shader_shadow.c
index 14fd2ed3d28..f84c7ffb7db 100644
--- a/source/blender/shader_fx/intern/FX_shader_shadow.c
+++ b/source/blender/shader_fx/intern/FX_shader_shadow.c
@@ -89,14 +89,11 @@ static bool isDisabled(ShaderFxData *fx, int UNUSED(userRenderParams))
   return (!fxd->object) && (fxd->flag & FX_SHADOW_USE_OBJECT);
 }
 
-static void foreachObjectLink(ShaderFxData *fx,
-                              Object *ob,
-                              ShaderFxObjectWalkFunc walk,
-                              void *userData)
+static void foreachIDLink(ShaderFxData *fx, Object *ob, IDWalkFunc walk, void *userData)
 {
   ShadowShaderFxData *fxd = (ShadowShaderFxData *)fx;
 
-  walk(userData, ob, &fxd->object, IDWALK_CB_NOP);
+  walk(userData, ob, (ID **)&fxd->object, IDWALK_CB_NOP);
 }
 
 static void panel_draw(const bContext *UNUSED(C), Panel *panel)
@@ -191,7 +188,6 @@ ShaderFxTypeInfo shaderfx_Type_Shadow = {
     /* isDisabled */ isDisabled,
     /* updateDepsgraph */ updateDepsgraph,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ foreachObjectLink,
-    /* foreachIDLink */ NULL,
+    /* foreachIDLink */ foreachIDLink,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.c b/source/blender/shader_fx/intern/FX_shader_swirl.c
index 3db2660a663..19ed3028f1c 100644
--- a/source/blender/shader_fx/intern/FX_shader_swirl.c
+++ b/source/blender/shader_fx/intern/FX_shader_swirl.c
@@ -76,14 +76,11 @@ static bool isDisabled(ShaderFxData *fx, int UNUSED(userRenderParams))
   return !fxd->object;
 }
 
-static void foreachObjectLink(ShaderFxData *fx,
-                              Object *ob,
-                              ShaderFxObjectWalkFunc walk,
-                              void *userData)
+static void foreachIDLink(ShaderFxData *fx, Object *ob, IDWalkFunc walk, void *userData)
 {
   SwirlShaderFxData *fxd = (SwirlShaderFxData *)fx;
 
-  walk(userData, ob, &fxd->object, IDWALK_CB_NOP);
+  walk(userData, ob, (ID **)&fxd->object, IDWALK_CB_NOP);
 }
 
 static void panel_draw(const bContext *UNUSED(C), Panel *panel)
@@ -120,7 +117,6 @@ ShaderFxTypeInfo shaderfx_Type_Swirl = {
     /* isDisabled */ isDisabled,
     /* updateDepsgraph */ updateDepsgraph,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ foreachObjectLink,
-    /* foreachIDLink */ NULL,
+    /* foreachIDLink */ foreachIDLink,
     /* panelRegister */ panelRegister,
 };
diff --git a/source/blender/shader_fx/intern/FX_shader_wave.c b/source/blender/shader_fx/intern/FX_shader_wave.c
index 53089f2d477..0f873e0d831 100644
--- a/source/blender/shader_fx/intern/FX_shader_wave.c
+++ b/source/blender/shader_fx/intern/FX_shader_wave.c
@@ -90,7 +90,6 @@ ShaderFxTypeInfo shaderfx_Type_Wave = {
     /* isDisabled */ NULL,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* panelRegister */ panelRegister,
 };
-- 
cgit v1.2.3