diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-06-25 13:33:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-25 13:33:35 +0400 |
commit | 0529766f32b70f38d4089297c8b5e86b964de289 (patch) | |
tree | 33d5ab9bb32112b6e4a3409ca869ab277750b7b3 /source | |
parent | 833c03791fd197c3ce9eca46307f6b06ade6e502 (diff) |
Use api function for flipping button list & rename to BLI_listbase_reverse
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenlib/BLI_listbase.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/listbase.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_edgeloop.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 13 |
4 files changed, 5 insertions, 14 deletions
diff --git a/source/blender/blenlib/BLI_listbase.h b/source/blender/blenlib/BLI_listbase.h index 028892e8f66..b900b5f21a5 100644 --- a/source/blender/blenlib/BLI_listbase.h +++ b/source/blender/blenlib/BLI_listbase.h @@ -75,7 +75,7 @@ void BLI_freelinkN(struct ListBase *listbase, void *vlink) ATTR_NONNULL(1); void BLI_movelisttolist(struct ListBase *dst, struct ListBase *src) ATTR_NONNULL(1, 2); void BLI_duplicatelist(struct ListBase *dst, const struct ListBase *src) ATTR_NONNULL(1, 2); -void BLI_reverselist(struct ListBase *lb) ATTR_NONNULL(1); +void BLI_listbase_reverse(struct ListBase *lb) ATTR_NONNULL(1); void BLI_rotatelist_first(struct ListBase *lb, void *vlink) ATTR_NONNULL(1, 2); void BLI_rotatelist_last(struct ListBase *lb, void *vlink) ATTR_NONNULL(1, 2); diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index 76ad687de3c..b0c24899bd1 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -577,7 +577,7 @@ void BLI_duplicatelist(ListBase *dst, const ListBase *src) } } -void BLI_reverselist(ListBase *lb) +void BLI_listbase_reverse(ListBase *lb) { struct Link *curr = lb->first; struct Link *prev = NULL; diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c index c8a954ab6a3..f01e1197bb7 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.c +++ b/source/blender/bmesh/intern/bmesh_edgeloop.c @@ -657,7 +657,7 @@ bool BM_edgeloop_calc_normal_aligned(BMesh *UNUSED(bm), BMEdgeLoopStore *el_stor void BM_edgeloop_flip(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store) { negate_v3(el_store->no); - BLI_reverselist(&el_store->verts); + BLI_listbase_reverse(&el_store->verts); } void BM_edgeloop_expand(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store, int el_store_len) diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 0f4bba8d29b..98e4fa2505f 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3791,8 +3791,7 @@ void uiBlockSetDirection(uiBlock *block, char direction) /* this call escapes if there's alignment flags */ void uiBlockFlipOrder(uiBlock *block) { - ListBase lb; - uiBut *but, *next; + uiBut *but; float centy, miny = 10000, maxy = -10000; if (U.uiflag & USER_MENUFIXEDORDER) @@ -3814,15 +3813,7 @@ void uiBlockFlipOrder(uiBlock *block) } /* also flip order in block itself, for example for arrowkey */ - BLI_listbase_clear(&lb); - but = block->buttons.first; - while (but) { - next = but->next; - BLI_remlink(&block->buttons, but); - BLI_addtail(&lb, but); - but = next; - } - block->buttons = lb; + BLI_listbase_reverse(&block->buttons); } |