archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-05-14 09:01:07 +02:00
parent 66f0c10f84 43ee4d5d7c
commit f78ba4bcfe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_utildefines.h
View File

@@ -385,7 +385,7 @@ extern "C" {
*/
#define ARRAY_DELETE(arr, index, delete_len, arr_len) \
{ \
BLI_assert(((index) >= 0) && ((index) + delete_len <= arr_len)); \
BLI_assert((&arr[index] >= arr) && ((index) + delete_len <= arr_len)); \
memmove(&(arr)[index], \
&(arr)[(index) + (delete_len)], \
(((arr_len) - (index)) - (delete_len)) * sizeof(*(arr))); \
@@ -400,7 +400,7 @@ extern "C" {
*/
#define ARRAY_DELETE_REORDER_LAST(arr, index, delete_len, arr_len) \
{ \
BLI_assert(((index) >= 0) && ((index) + delete_len <= arr_len)); \
BLI_assert((&arr[index] >= arr) && ((index) + delete_len <= arr_len)); \
if ((index) + (delete_len) != (arr_len)) { \
if (((delete_len) == 1) || ((delete_len) <= ((arr_len) - ((index) + (delete_len))))) { \
memcpy(&(arr)[index], \