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

Refactor: Move armature foreach_id to new IDTypeInfo structure.

This commit is contained in:
Bastien Montagne 2020-05-12 18:35:33 +02:00
parent 9996688b71
commit 5fd64c014f
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/armature.c
View File

@ -61,6 +61,7 @@
#include "BKE_idtype.h"
#include "BKE_lattice.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_object.h"
#include "BKE_scene.h"
@ -150,6 +151,24 @@ static void armature_free_data(struct ID *id)
}
}
static void armature_foreach_id_bone(Bone *bone, LibraryForeachIDData *data)
{
IDP_foreach_property(
bone->prop, IDP_TYPE_FILTER_ID, BKE_lib_query_idpropertiesForeachIDLink_callback, data);
LISTBASE_FOREACH (Bone *, curbone, &bone->childbase) {
armature_foreach_id_bone(curbone, data);
}
}
static void armature_foreach_id(ID *id, LibraryForeachIDData *data)
{
bArmature *arm = (bArmature *)id;
LISTBASE_FOREACH (Bone *, bone, &arm->bonebase) {
armature_foreach_id_bone(bone, data);
}
}
IDTypeInfo IDType_ID_AR = {
.id_code = ID_AR,
.id_filter = FILTER_ID_AR,
@ -164,6 +183,7 @@ IDTypeInfo IDType_ID_AR = {
.copy_data = armature_copy_data,
.free_data = armature_free_data,
.make_local = NULL,
.foreach_id = armature_foreach_id,
};
/* **************** Generic Functions, data level *************** */

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

@ -337,18 +337,6 @@ static void library_foreach_paint(LibraryForeachIDData *data, Paint *paint)
FOREACH_FINALIZE_VOID;
}
static void library_foreach_bone(LibraryForeachIDData *data, Bone *bone)
{
IDP_foreach_property(
bone->prop, IDP_TYPE_FILTER_ID, BKE_lib_query_idpropertiesForeachIDLink_callback, data);
LISTBASE_FOREACH (Bone *, curbone, &bone->childbase) {
library_foreach_bone(data, curbone);
}
FOREACH_FINALIZE_VOID;
}
static void library_foreach_layer_collection(LibraryForeachIDData *data, ListBase *lb)
{
LISTBASE_FOREACH (LayerCollection *, lc, lb) {
@ -902,11 +890,7 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_AR: {
bArmature *arm = (bArmature *)id;
LISTBASE_FOREACH (Bone *, bone, &arm->bonebase) {
library_foreach_bone(&data, bone);
}
BLI_assert(0);
break;
}