blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Cleanup: simplify a bit libquery code.

This commit is contained in:
Bastien Montagne 2020-04-30 18:01:47 +02:00
parent f4b020eec3
commit 4612ca3ede
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/blenkernel/intern/lib_query.c
View File

@ -535,14 +535,12 @@ static void library_foreach_screen_area(LibraryForeachIDData *data, ScrArea *are
FOREACH_FINALIZE_VOID;
}
static void library_foreach_ID_as_subdata_link(ID **id_pp,
LibraryIDLinkCallback callback,
void *user_data,
int flag,
LibraryForeachIDData *data)
static void library_foreach_ID_as_subdata_link(ID **id_pp, LibraryForeachIDData *data)
{
/* Needed e.g. for callbacks handling relationships... This call shall be absolutely readonly. */
ID *id = *id_pp;
const int flag = data->flag;
FOREACH_CALLBACK_INVOKE_ID_PP(data, id_pp, IDWALK_CB_EMBEDDED);
BLI_assert(id == *id_pp);
@ -559,7 +557,8 @@ static void library_foreach_ID_as_subdata_link(ID **id_pp,
}
}
else {
library_foreach_ID_link(data->bmain, data->owner_id, id, callback, user_data, flag, data);
library_foreach_ID_link(
data->bmain, data->owner_id, id, data->callback, data->user_data, data->flag, data);
}
FOREACH_FINALIZE_VOID;
@ -675,8 +674,7 @@ static void library_foreach_ID_link(Main *bmain,
CALLBACK_INVOKE(scene->r.bake.cage_object, IDWALK_CB_NOP);
if (scene->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
library_foreach_ID_as_subdata_link(
(ID **)&scene->nodetree, callback, user_data, flag, &data);
library_foreach_ID_as_subdata_link((ID **)&scene->nodetree, &data);
}
if (scene->ed) {
Sequence *seq;
@ -929,8 +927,7 @@ static void library_foreach_ID_link(Main *bmain,
Material *material = (Material *)id;
if (material->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
library_foreach_ID_as_subdata_link(
(ID **)&material->nodetree, callback, user_data, flag, &data);
library_foreach_ID_as_subdata_link((ID **)&material->nodetree, &data);
}
if (material->texpaintslot != NULL) {
CALLBACK_INVOKE(material->texpaintslot->ima, IDWALK_CB_NOP);
@ -946,8 +943,7 @@ static void library_foreach_ID_link(Main *bmain,
Tex *texture = (Tex *)id;
if (texture->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
library_foreach_ID_as_subdata_link(
(ID **)&texture->nodetree, callback, user_data, flag, &data);
library_foreach_ID_as_subdata_link((ID **)&texture->nodetree, &data);
}
CALLBACK_INVOKE(texture->ima, IDWALK_CB_USER);
break;
@ -963,8 +959,7 @@ static void library_foreach_ID_link(Main *bmain,
Light *lamp = (Light *)id;
if (lamp->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
library_foreach_ID_as_subdata_link(
(ID **)&lamp->nodetree, callback, user_data, flag, &data);
library_foreach_ID_as_subdata_link((ID **)&lamp->nodetree, &data);
}
break;
}
@ -994,8 +989,7 @@ static void library_foreach_ID_link(Main *bmain,
World *world = (World *)id;
if (world->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
library_foreach_ID_as_subdata_link(
(ID **)&world->nodetree, callback, user_data, flag, &data);
library_foreach_ID_as_subdata_link((ID **)&world->nodetree, &data);
}
break;
}
@ -1151,8 +1145,7 @@ static void library_foreach_ID_link(Main *bmain,
}
if (linestyle->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
library_foreach_ID_as_subdata_link(
(ID **)&linestyle->nodetree, callback, user_data, flag, &data);
library_foreach_ID_as_subdata_link((ID **)&linestyle->nodetree, &data);
}
LISTBASE_FOREACH (LineStyleModifier *, lsm, &linestyle->color_modifiers) {
@ -1282,8 +1275,7 @@ static void library_foreach_ID_link(Main *bmain,
Simulation *simulation = (Simulation *)id;
if (simulation->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
library_foreach_ID_as_subdata_link(
(ID **)&simulation->nodetree, callback, user_data, flag, &data);
library_foreach_ID_as_subdata_link((ID **)&simulation->nodetree, &data);
}
break;
}