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

Refactor: Move grease pencil foreach_id to new IDTypeInfo structure.

This commit is contained in:
Bastien Montagne 2020-05-20 16:31:47 +02:00
parent 796412dca0
commit 140935ee7e
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenkernel/intern/gpencil.c
View File

@ -55,6 +55,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_paint.h"
@ -97,6 +98,19 @@ static void greasepencil_free_data(ID *id)
BKE_gpencil_free((bGPdata *)id, true);
}
static void greasepencil_foreach_id(ID *id, LibraryForeachIDData *data)
{
bGPdata *gpencil = (bGPdata *)id;
/* materials */
for (int i = 0; i < gpencil->totcol; i++) {
BKE_LIB_FOREACHID_PROCESS(data, gpencil->mat[i], IDWALK_CB_USER);
}
LISTBASE_FOREACH (bGPDlayer *, gplayer, &gpencil->layers) {
BKE_LIB_FOREACHID_PROCESS(data, gplayer->parent, IDWALK_CB_NOP);
}
}
IDTypeInfo IDType_ID_GD = {
.id_code = ID_GD,
.id_filter = FILTER_ID_GD,
@ -111,6 +125,7 @@ IDTypeInfo IDType_ID_GD = {
.copy_data = greasepencil_copy_data,
.free_data = greasepencil_free_data,
.make_local = NULL,
.foreach_id = greasepencil_foreach_id,
};
/* ************************************************** */

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

@ -861,16 +861,7 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_GD: {
bGPdata *gpencil = (bGPdata *)id;
/* materials */
for (i = 0; i < gpencil->totcol; i++) {
CALLBACK_INVOKE(gpencil->mat[i], IDWALK_CB_USER);
}
LISTBASE_FOREACH (bGPDlayer *, gplayer, &gpencil->layers) {
CALLBACK_INVOKE(gplayer->parent, IDWALK_CB_NOP);
}
BLI_assert(0);
break;
}
case ID_HA: {