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

Refactor: Move lamp foreach_id to new IDTypeInfo structure.

This commit is contained in:
Bastien Montagne 2020-05-12 18:54:38 +02:00
parent 8ce0c9111d
commit 13d0f74b80
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,11 +925,7 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_LA: {
Light *lamp = (Light *)id;
if (lamp->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
BKE_library_foreach_ID_embedded(&data, (ID **)&lamp->nodetree);
}
BLI_assert(0);
break;
}

11
source/blender/blenkernel/intern/light.c
View File

@ -41,6 +41,7 @@
#include "BKE_icons.h"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_light.h"
#include "BKE_main.h"
#include "BKE_node.h"
@ -107,6 +108,15 @@ static void light_free_data(ID *id)
la->id.icon_id = 0;
}
static void light_foreach_id(ID *id, LibraryForeachIDData *data)
{
Light *lamp = (Light *)id;
if (lamp->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
BKE_library_foreach_ID_embedded(data, (ID **)&lamp->nodetree);
}
}
IDTypeInfo IDType_ID_LA = {
.id_code = ID_LA,
.id_filter = FILTER_ID_LA,
@ -121,6 +131,7 @@ IDTypeInfo IDType_ID_LA = {
.copy_data = light_copy_data,
.free_data = light_free_data,
.make_local = NULL,
.foreach_id = light_foreach_id,
};
Light *BKE_light_add(Main *bmain, const char *name)