From 78d38a90332027609933be102e61438cb4c7f9f0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 11 Jul 2014 15:30:42 +1000 Subject: [PATCH] BLI_array: avoid mixing terms count/length --- source/blender/blenlib/BLI_array.h | 2 +- source/blender/bmesh/operators/bmo_edgenet.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index f8e23629429..b2f0bd5fb40 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -144,7 +144,7 @@ void _bli_array_grow_func(void **arr_p, const void *arr_static, /* set the count of the array, doesn't actually increase the allocated array * size. don't use this unless you know what you're doing. */ -#define BLI_array_length_set(arr, count) \ +#define BLI_array_count_set(arr, count) \ { _##arr##_count = (count); }(void)0 /* only to prevent unused warnings */ diff --git a/source/blender/bmesh/operators/bmo_edgenet.c b/source/blender/bmesh/operators/bmo_edgenet.c index 0c5de590ccf..4423123f65e 100644 --- a/source/blender/bmesh/operators/bmo_edgenet.c +++ b/source/blender/bmesh/operators/bmo_edgenet.c @@ -179,11 +179,11 @@ void bmo_edgenet_prepare_exec(BMesh *bm, BMOperator *op) if (!count) { edges1 = edges; - BLI_array_length_set(edges1, BLI_array_count(edges)); + BLI_array_count_set(edges1, BLI_array_count(edges)); } else { edges2 = edges; - BLI_array_length_set(edges2, BLI_array_count(edges)); + BLI_array_count_set(edges2, BLI_array_count(edges)); } BLI_array_empty(edges);