diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-14 10:01:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-14 10:01:11 +0300 |
| commit | f78ba4bcfe8b06645de0913116b3b519eceb1c7e (patch) | |
| tree | 35af79eeceda988e17ce84ce64888e87f596494e /source/blender/blenlib | |
| parent | 66f0c10f844d5830b14c7dd2d1469edceb04f2aa (diff) | |
| parent | 43ee4d5d7c6743de6048658354ebaa202f23054d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 5af97ebb411..c0b76aa9cbf 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -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], \ |