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

Refactor: libquery: Add Material foreach_id support.

This commit is contained in:
Bastien Montagne 2020-05-07 16:48:43 +02:00
parent 339c3e3473
commit 95f8f321b6
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -976,18 +976,7 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_MA: {
Material *material = (Material *)id;
if (material->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
BKE_library_foreach_ID_embedded(&data, (ID **)&material->nodetree);
}
if (material->texpaintslot != NULL) {
CALLBACK_INVOKE(material->texpaintslot->ima, IDWALK_CB_NOP);
}
if (material->gp_style != NULL) {
CALLBACK_INVOKE(material->gp_style->sima, IDWALK_CB_USER);
CALLBACK_INVOKE(material->gp_style->ima, IDWALK_CB_USER);
}
BLI_assert(0);
break;
}

18
source/blender/blenkernel/intern/material.c
View File

@ -64,6 +64,7 @@
#include "BKE_idtype.h"
#include "BKE_image.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
@ -143,6 +144,22 @@ static void material_free_data(ID *id)
BKE_previewimg_free(&material->preview);
}
static void material_foreach_id(ID *id, LibraryForeachIDData *data)
{
Material *material = (Material *)id;
/* Nodetrees **are owned by IDs**, treat them as mere sub-data and not real ID! */
if (!BKE_library_foreach_ID_embedded(data, (ID **)&material->nodetree)) {
return;
}
if (material->texpaintslot != NULL) {
BKE_LIB_FOREACHID_PROCESS(data, material->texpaintslot->ima, IDWALK_CB_NOP);
}
if (material->gp_style != NULL) {
BKE_LIB_FOREACHID_PROCESS(data, material->gp_style->sima, IDWALK_CB_USER);
BKE_LIB_FOREACHID_PROCESS(data, material->gp_style->ima, IDWALK_CB_USER);
}
}
IDTypeInfo IDType_ID_MA = {
.id_code = ID_MA,
.id_filter = FILTER_ID_MA,
@ -157,6 +174,7 @@ IDTypeInfo IDType_ID_MA = {
.copy_data = material_copy_data,
.free_data = material_free_data,
.make_local = NULL,
.foreach_id = material_foreach_id,
};
void BKE_gpencil_material_attr_init(Material *ma)