blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Refactor: Move Curve foreach_id to new IDTypeInfo structure.

This commit is contained in:
Bastien Montagne 2020-05-12 17:57:17 +02:00
parent 1606e732c2
commit ef6610dec5
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,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_object.h"
@ -117,6 +118,22 @@ static void curve_free_data(ID *id)
MEM_SAFE_FREE(curve->tb);
}
static void curve_foreach_id(ID *id, LibraryForeachIDData *data)
{
Curve *curve = (Curve *)id;
BKE_LIB_FOREACHID_PROCESS(data, curve->bevobj, IDWALK_CB_NOP);
BKE_LIB_FOREACHID_PROCESS(data, curve->taperobj, IDWALK_CB_NOP);
BKE_LIB_FOREACHID_PROCESS(data, curve->textoncurve, IDWALK_CB_NOP);
BKE_LIB_FOREACHID_PROCESS(data, curve->key, IDWALK_CB_USER);
for (int i = 0; i < curve->totcol; i++) {
BKE_LIB_FOREACHID_PROCESS(data, curve->mat[i], IDWALK_CB_USER);
}
BKE_LIB_FOREACHID_PROCESS(data, curve->vfont, IDWALK_CB_USER);
BKE_LIB_FOREACHID_PROCESS(data, curve->vfontb, IDWALK_CB_USER);
BKE_LIB_FOREACHID_PROCESS(data, curve->vfonti, IDWALK_CB_USER);
BKE_LIB_FOREACHID_PROCESS(data, curve->vfontbi, IDWALK_CB_USER);
}
IDTypeInfo IDType_ID_CU = {
.id_code = ID_CU,
.id_filter = FILTER_ID_CU,
@ -131,6 +148,7 @@ IDTypeInfo IDType_ID_CU = {
.copy_data = curve_copy_data,
.free_data = curve_free_data,
.make_local = NULL,
.foreach_id = curve_foreach_id,
};
static int cu_isectLL(const float v1[3],

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

@ -917,18 +917,7 @@ static void library_foreach_ID_link(Main *bmain,
}
case ID_CU: {
Curve *curve = (Curve *)id;
CALLBACK_INVOKE(curve->bevobj, IDWALK_CB_NOP);
CALLBACK_INVOKE(curve->taperobj, IDWALK_CB_NOP);
CALLBACK_INVOKE(curve->textoncurve, IDWALK_CB_NOP);
CALLBACK_INVOKE(curve->key, IDWALK_CB_USER);
for (i = 0; i < curve->totcol; i++) {
CALLBACK_INVOKE(curve->mat[i], IDWALK_CB_USER);
}
CALLBACK_INVOKE(curve->vfont, IDWALK_CB_USER);
CALLBACK_INVOKE(curve->vfontb, IDWALK_CB_USER);
CALLBACK_INVOKE(curve->vfonti, IDWALK_CB_USER);
CALLBACK_INVOKE(curve->vfontbi, IDWALK_CB_USER);
BLI_assert(0);
break;
}