From 1e7ef83e4677e90b4b9b37d43ac9beb3525898e1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Dec 2021 18:26:35 +1100 Subject: Cleanup: clarify source/destination args for BKE_spacedata_copylist --- source/blender/blenkernel/BKE_screen.h | 4 ++-- source/blender/blenkernel/intern/screen.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index f5acb810950..fd0682ee8f0 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -410,9 +410,9 @@ void BKE_spacetypes_free(void); /* only for quitting blender */ void BKE_spacedata_freelist(ListBase *lb); /** - * \param lb1: should be empty. + * \param lb_dst: should be empty (will be cleared). */ -void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2); +void BKE_spacedata_copylist(ListBase *lb_dst, ListBase *lb_src); /** * Facility to set locks for drawing to survive (render) threads accessing drawing data. diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 531b5d42132..5c81b3e238a 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -499,29 +499,29 @@ ARegion *BKE_area_region_copy(const SpaceType *st, const ARegion *region) return newar; } -/* from lb2 to lb1, lb1 is supposed to be freed */ -static void region_copylist(SpaceType *st, ListBase *lb1, ListBase *lb2) +/* from lb_src to lb_dst, lb_dst is supposed to be freed */ +static void region_copylist(SpaceType *st, ListBase *lb_dst, ListBase *lb_src) { /* to be sure */ - BLI_listbase_clear(lb1); + BLI_listbase_clear(lb_dst); - LISTBASE_FOREACH (ARegion *, region, lb2) { + LISTBASE_FOREACH (ARegion *, region, lb_src) { ARegion *region_new = BKE_area_region_copy(st, region); - BLI_addtail(lb1, region_new); + BLI_addtail(lb_dst, region_new); } } -void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2) +void BKE_spacedata_copylist(ListBase *lb_dst, ListBase *lb_src) { - BLI_listbase_clear(lb1); /* to be sure */ + BLI_listbase_clear(lb_dst); /* to be sure */ - LISTBASE_FOREACH (SpaceLink *, sl, lb2) { + LISTBASE_FOREACH (SpaceLink *, sl, lb_src) { SpaceType *st = BKE_spacetype_from_id(sl->spacetype); if (st && st->duplicate) { SpaceLink *slnew = st->duplicate(sl); - BLI_addtail(lb1, slnew); + BLI_addtail(lb_dst, slnew); region_copylist(st, &slnew->regionbase, &sl->regionbase); } -- cgit v1.2.3