diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-07-30 09:01:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-30 09:01:16 +0400 |
commit | b64e36d26dac8463c0f4a1dc1dbd9cf1ef27e0d9 (patch) | |
tree | 1279ddb4902665eadf7321675a3c865276929508 /source/blender/bmesh | |
parent | ce0ff266e988bf605e27ae8c393a7f74b2763d53 (diff) |
BLI_listbase: consistent name prefix
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_edgeloop.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_bridge.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide_edgering.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c index f01e1197bb7..e83a1d5b00a 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.c +++ b/source/blender/bmesh/intern/bmesh_edgeloop.c @@ -682,12 +682,12 @@ void BM_edgeloop_expand(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store, int el_sto LinkData *node_curr_init = node_curr; LinkData *node_curr_copy; int i = 0; - LISTBASE_CIRCULAR_FORWARD_BEGIN (&el_store->verts, node_curr, node_curr_init) { + BLI_LISTBASE_CIRCULAR_FORWARD_BEGIN (&el_store->verts, node_curr, node_curr_init) { if (i++ < step) { break; } } - LISTBASE_CIRCULAR_FORWARD_END (&el_store->verts, node_curr, node_curr_init); + BLI_LISTBASE_CIRCULAR_FORWARD_END (&el_store->verts, node_curr, node_curr_init); node_curr_copy = MEM_dupallocN(node_curr); BLI_insertlinkafter(&el_store->verts, node_curr, node_curr_copy); diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index 9e9cd0d66e2..e4417477e76 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -119,7 +119,7 @@ static void bm_bridge_best_rotation(struct BMEdgeLoopStore *el_store_a, struct B } if (el_b_best) { - BLI_rotatelist_first(lb_b, el_b_best); + BLI_listbase_rotate_first(lb_b, el_b_best); } } @@ -272,7 +272,7 @@ static void bridge_loop_pair(BMesh *bm, const int len_b = BM_edgeloop_length_get(el_store_b); ListBase *lb_b = BM_edgeloop_verts_get(el_store_b); LinkData *el_b = BLI_rfindlink(lb_b, mod_i(twist_offset, len_b)); - BLI_rotatelist_first(lb_b, el_b); + BLI_listbase_rotate_first(lb_b, el_b); } } diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index e13a9df4474..8bb4722ea07 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -920,13 +920,13 @@ static void bm_edgering_pair_order(BMesh *bm, } BLI_assert(node != NULL); - BLI_rotatelist_first(lb_b, node); + BLI_listbase_rotate_first(lb_b, node); /* now check we are winding the same way */ if (bm_edgering_pair_order_is_flipped(bm, el_store_a, el_store_b)) { BM_edgeloop_flip(bm, el_store_b); /* re-ensure the first node */ - BLI_rotatelist_first(lb_b, node); + BLI_listbase_rotate_first(lb_b, node); } /* sanity checks that we are aligned & winding now */ |