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

Refactor: libquery: Add Mesh foreach_id support.

This commit is contained in:
Bastien Montagne 2020-05-07 15:55:52 +02:00
parent e39878b90e
commit cb8a197bc7
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -947,12 +947,7 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_ME: {
Mesh *mesh = (Mesh *)id;
CALLBACK_INVOKE(mesh->texcomesh, IDWALK_CB_NEVER_SELF);
CALLBACK_INVOKE(mesh->key, IDWALK_CB_USER);
for (i = 0; i < mesh->totcol; i++) {
CALLBACK_INVOKE(mesh->mat[i], IDWALK_CB_USER);
}
BLI_assert(0);
break;
}

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

@ -25,6 +25,7 @@
#include "DNA_defaults.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
@ -47,6 +48,7 @@
#include "BKE_idtype.h"
#include "BKE_key.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
@ -142,6 +144,16 @@ static void mesh_free_data(ID *id)
MEM_SAFE_FREE(mesh->mat);
}
static void mesh_foreach_id(ID *id, LibraryForeachIDData *data)
{
Mesh *mesh = (Mesh *)id;
BKE_LIB_FOREACHID_PROCESS(data, mesh->texcomesh, IDWALK_CB_NEVER_SELF);
BKE_LIB_FOREACHID_PROCESS(data, mesh->key, IDWALK_CB_USER);
for (int i = 0; i < mesh->totcol; i++) {
BKE_LIB_FOREACHID_PROCESS(data, mesh->mat[i], IDWALK_CB_USER);
}
}
IDTypeInfo IDType_ID_ME = {
.id_code = ID_ME,
.id_filter = FILTER_ID_ME,
@ -156,6 +168,7 @@ IDTypeInfo IDType_ID_ME = {
.copy_data = mesh_copy_data,
.free_data = mesh_free_data,
.make_local = NULL,
.foreach_id = mesh_foreach_id,
};
enum {