diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 17:13:13 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 17:13:13 +0300 |
| commit | be5ccb9ce886850ea6c5db337423e68e729f17c7 (patch) | |
| tree | 4839b6831bb10355fbb5f9025665c5ef18fc7a92 /source/blender/blenlib | |
| parent | c48eb521642b5d94e5f0eb8fd15f7d587f407078 (diff) | |
| parent | 9336aef4eb279804ee5cccec63d818810233e6c5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_array_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_array_utils.h b/source/blender/blenlib/BLI_array_utils.h index 9a510bcfc3b..da03063b245 100644 --- a/source/blender/blenlib/BLI_array_utils.h +++ b/source/blender/blenlib/BLI_array_utils.h @@ -41,7 +41,7 @@ void _bli_array_permute( const unsigned int *index, void *arr_temp); #define BLI_array_permute(arr, arr_len, order) \ _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, NULL) -#define BLI_array_permute_ex(arr, arr_len, index, arr_temp) \ +#define BLI_array_permute_ex(arr, arr_len, order, arr_temp) \ _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, arr_temp) int _bli_array_findindex(const void *arr, unsigned int arr_len, size_t arr_stride, const void *p); |