griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: reduce repitition in curve font access

Browse Source
This commit is contained in:
Campbell Barton
2024-12-11 17:25:53 +11:00
parent 139498738a
commit 27eece6d49
2 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/editors/object/object_add.cc
View File

@@ -3362,22 +3362,19 @@ static Object *convert_font_to_curves_legacy(Base &base,
newob->type = OB_CURVES_LEGACY;
cu->type = OB_CURVES_LEGACY;
if (cu->vfont) {
id_us_min(&cu->vfont->id);
cu->vfont = nullptr;
}
if (cu->vfontb) {
id_us_min(&cu->vfontb->id);
cu->vfontb = nullptr;
}
if (cu->vfonti) {
id_us_min(&cu->vfonti->id);
cu->vfonti = nullptr;
}
if (cu->vfontbi) {
id_us_min(&cu->vfontbi->id);
cu->vfontbi = nullptr;
}
#define CURVE_VFONT_CLEAR(vfont_member) \
if (cu->vfont_member) { \
id_us_min(&cu->vfont_member->id); \
cu->vfont_member = nullptr; \
} \
((void)0)
CURVE_VFONT_CLEAR(vfont);
CURVE_VFONT_CLEAR(vfontb);
CURVE_VFONT_CLEAR(vfonti);
CURVE_VFONT_CLEAR(vfontbi);
#undef CURVE_VFONT_CLEAR
if (!info.keep_original) {
/* other users */

36
source/blender/editors/object/object_relations.cc
View File

@@ -1567,26 +1567,22 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
break;
}
if (cu_dst->vfont) {
id_us_min(&cu_dst->vfont->id);
}
cu_dst->vfont = cu_src->vfont;
id_us_plus((ID *)cu_dst->vfont);
if (cu_dst->vfontb) {
id_us_min(&cu_dst->vfontb->id);
}
cu_dst->vfontb = cu_src->vfontb;
id_us_plus((ID *)cu_dst->vfontb);
if (cu_dst->vfonti) {
id_us_min(&cu_dst->vfonti->id);
}
cu_dst->vfonti = cu_src->vfonti;
id_us_plus((ID *)cu_dst->vfonti);
if (cu_dst->vfontbi) {
id_us_min(&cu_dst->vfontbi->id);
}
cu_dst->vfontbi = cu_src->vfontbi;
id_us_plus((ID *)cu_dst->vfontbi);
#define CURVE_VFONT_SET(vfont_member) \
{ \
if (cu_dst->vfont_member) { \
id_us_min(&cu_dst->vfont_member->id); \
} \
cu_dst->vfont_member = cu_src->vfont_member; \
id_us_plus((ID *)cu_dst->vfont_member); \
} \
((void)0)
CURVE_VFONT_SET(vfont);
CURVE_VFONT_SET(vfontb);
CURVE_VFONT_SET(vfonti);
CURVE_VFONT_SET(vfontbi);
#undef CURVE_VFONT_SET
DEG_id_tag_update(&ob_dst->id,
ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);