blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Refactor: Move metaball foreach_id to new IDTypeInfo structure.

This commit is contained in:
Bastien Montagne 2020-05-12 18:03:42 +02:00
parent ef6610dec5
commit b1b93c2ef1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -922,10 +922,7 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_MB: {
MetaBall *metaball = (MetaBall *)id;
for (i = 0; i < metaball->totcol; i++) {
CALLBACK_INVOKE(metaball->mat[i], IDWALK_CB_USER);
}
BLI_assert(0);
break;
}

10
source/blender/blenkernel/intern/mball.c
View File

@ -54,6 +54,7 @@
#include "BKE_displist.h"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_material.h"
#include "BKE_mball.h"
#include "BKE_object.h"
@ -101,6 +102,14 @@ static void metaball_free_data(ID *id)
}
}
static void metaball_foreach_id(ID *id, LibraryForeachIDData *data)
{
MetaBall *metaball = (MetaBall *)id;
for (int i = 0; i < metaball->totcol; i++) {
BKE_LIB_FOREACHID_PROCESS(data, metaball->mat[i], IDWALK_CB_USER);
}
}
IDTypeInfo IDType_ID_MB = {
.id_code = ID_MB,
.id_filter = FILTER_ID_MB,
@ -115,6 +124,7 @@ IDTypeInfo IDType_ID_MB = {
.copy_data = metaball_copy_data,
.free_data = metaball_free_data,
.make_local = NULL,
.foreach_id = metaball_foreach_id,
};
/* Functions */