BLI_array: avoid mixing terms count/length
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Jul 2014 05:30:42 +0000 (15:30 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Jul 2014 05:30:42 +0000 (15:30 +1000)
source/blender/blenlib/BLI_array.h
source/blender/bmesh/operators/bmo_edgenet.c

index f8e2362942908552527278e72b7e7b6276439375..b2f0bd5fb40e22bd9b9a712df3e17e74ee557b03 100644 (file)
@@ -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 */
index 0c5de590ccfee87b83e7f36c6704bccd5ed60ebc..4423123f65e350a06b7643845c3621e2ffc620c3 100644 (file)
@@ -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);