[Bf-blender-cvs] [16e1b18dd88] master: Cleanup: Rename `scene.c`'s `FOREACHID_PROCESS` macro to `FOREACHID_PROCESS_IDSUPER`.
Bastien Montagne
noreply at git.blender.org
Wed Oct 27 09:52:36 CEST 2021
Commit: 16e1b18dd8899dbc47e971b5ca3deb7652ae954a
Author: Bastien Montagne
Date: Tue Oct 26 17:12:23 2021 +0200
Branches: master
https://developer.blender.org/rB16e1b18dd8899dbc47e971b5ca3deb7652ae954a
Cleanup: Rename `scene.c`'s `FOREACHID_PROCESS` macro to `FOREACHID_PROCESS_IDSUPER`.
Follow-up of rBf11ed418e5fa.
===================================================================
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 8059cd45f05..d7fc2005ab2 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -704,7 +704,7 @@ static bool seq_foreach_member_id_cb(Sequence *seq, void *user_data)
{
LibraryForeachIDData *data = (LibraryForeachIDData *)user_data;
-#define FOREACHID_PROCESS(_data, _id_super, _cb_flag) \
+#define FOREACHID_PROCESS_IDSUPER(_data, _id_super, _cb_flag) \
{ \
CHECK_TYPE(&((_id_super)->id), ID *); \
if (!BKE_lib_query_foreachid_process((_data), (ID **)&(_id_super), (_cb_flag))) { \
@@ -713,23 +713,23 @@ static bool seq_foreach_member_id_cb(Sequence *seq, void *user_data)
} \
((void)0)
- FOREACHID_PROCESS(data, seq->scene, IDWALK_CB_NEVER_SELF);
- FOREACHID_PROCESS(data, seq->scene_camera, IDWALK_CB_NOP);
- FOREACHID_PROCESS(data, seq->clip, IDWALK_CB_USER);
- FOREACHID_PROCESS(data, seq->mask, IDWALK_CB_USER);
- FOREACHID_PROCESS(data, seq->sound, IDWALK_CB_USER);
+ FOREACHID_PROCESS_IDSUPER(data, seq->scene, IDWALK_CB_NEVER_SELF);
+ FOREACHID_PROCESS_IDSUPER(data, seq->scene_camera, IDWALK_CB_NOP);
+ FOREACHID_PROCESS_IDSUPER(data, seq->clip, IDWALK_CB_USER);
+ FOREACHID_PROCESS_IDSUPER(data, seq->mask, IDWALK_CB_USER);
+ FOREACHID_PROCESS_IDSUPER(data, seq->sound, IDWALK_CB_USER);
IDP_foreach_property(
seq->prop, IDP_TYPE_FILTER_ID, BKE_lib_query_idpropertiesForeachIDLink_callback, data);
LISTBASE_FOREACH (SequenceModifierData *, smd, &seq->modifiers) {
- FOREACHID_PROCESS(data, smd->mask_id, IDWALK_CB_USER);
+ FOREACHID_PROCESS_IDSUPER(data, smd->mask_id, IDWALK_CB_USER);
}
if (seq->type == SEQ_TYPE_TEXT && seq->effectdata) {
TextVars *text_data = seq->effectdata;
- FOREACHID_PROCESS(data, text_data->text_font, IDWALK_CB_USER);
+ FOREACHID_PROCESS_IDSUPER(data, text_data->text_font, IDWALK_CB_USER);
}
-#undef FOREACHID_PROCESS
+#undef FOREACHID_PROCESS_IDSUPER
return true;
}
More information about the Bf-blender-cvs
mailing list