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/bmesh/intern/bmesh_edgeloop.c | 2 +- source/blender/bmesh/intern/bmesh_marking.c | 1 - source/blender/bmesh/intern/bmesh_operators.c | 2 +- source/blender/bmesh/intern/bmesh_walkers.c | 2 +- source/blender/bmesh/operators/bmo_connect_pair.c | 5 ++--- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c index 4724552e4c9..4c91f22759b 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.c +++ b/source/blender/bmesh/intern/bmesh_edgeloop.c @@ -252,7 +252,7 @@ static bool bm_loop_path_build_step(BLI_mempool *vs_pool, ListBase *lb, const in /* lb is now full of free'd items, overwrite */ *lb = lb_tmp; - return (lb->first != NULL); + return (BLI_listbase_is_empty(lb) == false); } bool BM_mesh_edgeloops_find_path(BMesh *bm, ListBase *r_eloops, diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 2f05d901d27..77505242002 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -874,7 +874,6 @@ void _bm_select_history_store_after(BMesh *bm, BMEditSelection *ese_ref, BMHeade void BM_select_history_clear(BMesh *bm) { BLI_freelistN(&bm->selected); - bm->selected.first = bm->selected.last = NULL; } diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 3dca80ca38a..4dba28ab035 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -1498,7 +1498,7 @@ void BMO_error_raise(BMesh *bm, BMOperator *owner, int errcode, const char *msg) bool BMO_error_occurred(BMesh *bm) { - return bm->errorstack.first != NULL; + return (BLI_listbase_is_empty(&bm->errorstack) == false); } /* returns error code or 0 if no error */ diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index af901b3359c..acb97d328cc 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -116,7 +116,7 @@ void BMW_init(BMWalker *walker, BMesh *bm, int type, } walker->worklist = BLI_mempool_create(walker->structsize, 100, 100, BLI_MEMPOOL_SYSMALLOC); - walker->states.first = walker->states.last = NULL; + BLI_listbase_clear(&walker->states); } /** diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index 0bc29c56256..1b78a6b1dc7 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -386,8 +386,7 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op) /* setup context */ { - pc.state_lb.first = NULL; - pc.state_lb.last = NULL; + BLI_listbase_clear(&pc.state_lb); pc.link_pool = BLI_mempool_create(sizeof(PathLink), 1, 512, BLI_MEMPOOL_SYSMALLOC); } @@ -486,7 +485,7 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op) } } - if (pc.state_lb.first == NULL) { + if (BLI_listbase_is_empty(&pc.state_lb)) { found_all = false; } -- cgit v1.2.3