blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: clarify source/destination args for BKE_spacedata_copylist

This commit is contained in:
Campbell Barton 2021-12-07 18:26:35 +11:00
parent a37a6fb445
commit 1e7ef83e46
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_screen.h
View File

@ -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.

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

@ -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);
}