From d411e1548cfda7a48e4df81eda1e998ae172ed43 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Jun 2014 04:22:14 +1000 Subject: Correction to last commit --- source/blender/blenlib/intern/sort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenlib/intern/sort.c') diff --git a/source/blender/blenlib/intern/sort.c b/source/blender/blenlib/intern/sort.c index 991337446cf..9fad7505f79 100644 --- a/source/blender/blenlib/intern/sort.c +++ b/source/blender/blenlib/intern/sort.c @@ -89,7 +89,7 @@ BLI_INLINE char *med3(char *a, char *b, char *c, BLI_sort_cmp_t cmp, void *thunk * * \note Follows BSD arg order (incompatible with glibc). */ -void BLI_qsort_r(void *a, size_t n, size_t es, void *thunk, BLI_sort_cmp_t cmp) +void BLI_qsort_r(void *a, size_t n, size_t es, BLI_sort_cmp_t cmp, void *thunk) { char *pa, *pb, *pc, *pd, *pl, *pm, *pn; int d, r, swaptype, swap_cnt; @@ -166,7 +166,7 @@ loop: r = min(pd - pc, pn - pd - es); vecswap(pb, pn - r, r); if ((r = pb - pa) > es) - BLI_qsort_r(a, r / es, es, thunk, cmp); + BLI_qsort_r(a, r / es, es, cmp, thunk); if ((r = pd - pc) > es) { /* Iterate rather than recurse to save stack space */ a = pn - r; -- cgit v1.2.3