From b3afbcab8ff2330c1473647be330a3ffe9b11885 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 8 Feb 2014 06:07:10 +1100 Subject: ListBase API: add utility api funcs for clearing and checking empty --- source/blender/editors/screen/area.c | 6 +++--- source/blender/editors/screen/screen_edit.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index b5607b42956..1a4f7c69bd7 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1447,7 +1447,7 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type) break; /* old spacedata... happened during work on 2.50, remove */ - if (sl && sl->regionbase.first == NULL) { + if (sl && BLI_listbase_is_empty(&sl->regionbase)) { st->free(sl); BLI_freelinkN(&sa->spacedata, sl); if (slold == sl) { @@ -1460,7 +1460,7 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type) /* swap regions */ slold->regionbase = sa->regionbase; sa->regionbase = sl->regionbase; - sl->regionbase.first = sl->regionbase.last = NULL; + BLI_listbase_clear(&sl->regionbase); /* put in front of list */ BLI_remlink(&sa->spacedata, sl); @@ -1476,7 +1476,7 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type) if (slold) slold->regionbase = sa->regionbase; sa->regionbase = sl->regionbase; - sl->regionbase.first = sl->regionbase.last = NULL; + BLI_listbase_clear(&sl->regionbase); } } diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 4674a5b36a3..86e78396fdf 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -500,7 +500,7 @@ static void screen_copy(bScreen *to, bScreen *from) BLI_duplicatelist(&to->vertbase, &from->vertbase); BLI_duplicatelist(&to->edgebase, &from->edgebase); BLI_duplicatelist(&to->areabase, &from->areabase); - to->regionbase.first = to->regionbase.last = NULL; + BLI_listbase_clear(&to->regionbase); s2 = to->vertbase.first; for (s1 = from->vertbase.first; s1; s1 = s1->next, s2 = s2->next) { @@ -520,10 +520,10 @@ static void screen_copy(bScreen *to, bScreen *from) sa->v3 = sa->v3->newv; sa->v4 = sa->v4->newv; - sa->spacedata.first = sa->spacedata.last = NULL; - sa->regionbase.first = sa->regionbase.last = NULL; - sa->actionzones.first = sa->actionzones.last = NULL; - sa->handlers.first = sa->handlers.last = NULL; + BLI_listbase_clear(&sa->spacedata); + BLI_listbase_clear(&sa->regionbase); + BLI_listbase_clear(&sa->actionzones); + BLI_listbase_clear(&sa->handlers); area_copy_data(sa, saf, 0); } -- cgit v1.2.3