diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-21 16:06:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-21 16:06:16 +0400 |
commit | 282315d9915094d589b09f3e25d11eee6b468a16 (patch) | |
tree | ee57c1f2c1d2d02e442a274c8a087dc53e0637dd /source | |
parent | b80345db0b62dba7882fb08e8b3298df7d15a805 (diff) |
ListBase: use BLI_listbase_ for new api calls
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_listbase.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/listbase.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 5cca948cd49..69b375fba58 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -2105,7 +2105,7 @@ bool BKE_keyblock_move(Object *ob, int org_index, int new_index) KeyBlock *other_kb = rev ? kb->prev : kb->next; /* Swap with previous/next list item. */ - BLI_swaplinks(&key->block, kb, other_kb); + BLI_listbase_swaplinks(&key->block, kb, other_kb); /* Swap absolute positions. */ SWAP(float, kb->pos, other_kb->pos); diff --git a/source/blender/blenlib/BLI_listbase.h b/source/blender/blenlib/BLI_listbase.h index fec05221596..3f03c4e3845 100644 --- a/source/blender/blenlib/BLI_listbase.h +++ b/source/blender/blenlib/BLI_listbase.h @@ -73,7 +73,7 @@ void BLI_freelist(struct ListBase *listbase) ATTR_NONNULL(1); int BLI_countlist(const struct ListBase *listbase) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); void BLI_freelinkN(struct ListBase *listbase, void *vlink) ATTR_NONNULL(1); -void BLI_swaplinks(struct ListBase *listbase, void *vlinka, void *vlinkb) ATTR_NONNULL(1, 2); +void BLI_listbase_swaplinks(struct ListBase *listbase, void *vlinka, void *vlinkb) ATTR_NONNULL(1, 2); 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); diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index 6d61a046094..6fcc5888382 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -132,7 +132,7 @@ bool BLI_remlink_safe(ListBase *listbase, void *vlink) /** * Swaps \a vlinka and \a vlinkb in the list. Assumes they are both already in the list! */ -void BLI_swaplinks(ListBase *listbase, void *vlinka, void *vlinkb) +void BLI_listbase_swaplinks(ListBase *listbase, void *vlinka, void *vlinkb) { Link *linka = vlinka; Link *linkb = vlinkb; |