diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 06:02:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 06:02:33 +0300 |
| commit | e4c9cf7088583353670e9783e0b0aecdf2a0c8df (patch) | |
| tree | a06c9fab7bcf8b51eac7986688ef9291b596f09f /source/blender/blenlib | |
| parent | 7b27b10fa6a6a7c4286f30ba2c625896e7ba3fe6 (diff) | |
| parent | 10fec1f153295c9bd60eaa96dfcd09d8cf1b3d91 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_array.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_buffer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index 3ffca818c0d..825acb18e91 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -151,7 +151,7 @@ void _bli_array_grow_func(void **arr_p, const void *arr_static, /** * resets the logical size of an array to zero, but doesn't * free the memory. */ -#define BLI_array_empty(arr) \ +#define BLI_array_clear(arr) \ { _##arr##_count = 0; } (void)0 /** diff --git a/source/blender/blenlib/BLI_buffer.h b/source/blender/blenlib/BLI_buffer.h index 0c0845daf19..0d2ef0dc9b3 100644 --- a/source/blender/blenlib/BLI_buffer.h +++ b/source/blender/blenlib/BLI_buffer.h @@ -77,7 +77,7 @@ enum { (BLI_buffer_at(buffer_, type_, (buffer_)->count - 1) = val_) \ ) -#define BLI_buffer_empty(buffer_) { \ +#define BLI_buffer_clear(buffer_) { \ (buffer_)->count = 0; \ } (void)0 |