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/blenkernel/BKE_shader_fx.h
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/blenkernel/BKE_shader_fx.h')
-rw-r--r--source/blender/blenkernel/BKE_shader_fx.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h
index be57521a17c..da14487c1f4 100644
--- a/source/blender/blenkernel/BKE_shader_fx.h
+++ b/source/blender/blenkernel/BKE_shader_fx.h
@@ -62,11 +62,6 @@ typedef enum {
eShaderFxTypeFlag_NoUserAdd = (1 << 5),
} ShaderFxTypeFlag;
-/* IMPORTANT! Keep ObjectWalkFunc and IDWalkFunc signatures compatible. */
-typedef void (*ShaderFxObjectWalkFunc)(void *userData,
- struct Object *ob,
- struct Object **obpoin,
- int cb_flag);
typedef void (*ShaderFxIDWalkFunc)(void *userData,
struct Object *ob,
struct ID **idpoin,
@@ -134,24 +129,12 @@ typedef struct ShaderFxTypeInfo {
*/
bool (*dependsOnTime)(struct ShaderFxData *fx);
- /* Should call the given walk function on with a pointer to each Object
- * pointer that the effect data stores. This is used for linking on file
- * load and for unlinking objects or forwarding object references.
- *
- * This function is optional.
- */
- void (*foreachObjectLink)(struct ShaderFxData *fx,
- struct Object *ob,
- ShaderFxObjectWalkFunc walk,
- void *userData);
-
/* Should call the given walk function with a pointer to each ID
* pointer (i.e. each data-block pointer) that the effect data
* stores. This is used for linking on file load and for
* unlinking data-blocks or forwarding data-block references.
*
- * This function is optional. If it is not present, foreachObjectLink
- * will be used.
+ * This function is optional.
*/
void (*foreachIDLink)(struct ShaderFxData *fx,
struct Object *ob,