From c1b1ed4d5b2f90b48296055e817fded0f8ee8f38 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 8 Apr 2021 11:22:47 +0200 Subject: Minor cleanup to `scene_collection_array`. Use array allocation, and remove useless check. --- source/blender/blenkernel/intern/collection.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 426f8a44aff..8e4633cbe15 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -2015,12 +2015,10 @@ static void scene_collections_array(Scene *scene, BLI_assert(collection != NULL); scene_collection_callback(collection, scene_collections_count, r_collections_array_len); - if (*r_collections_array_len == 0) { - return; - } + BLI_assert(*r_collections_array_len > 0); - Collection **array = MEM_mallocN(sizeof(Collection *) * (*r_collections_array_len), - "CollectionArray"); + Collection **array = MEM_malloc_arrayN( + *r_collections_array_len, sizeof(Collection *), "CollectionArray"); *r_collections_array = array; scene_collection_callback(collection, scene_collections_build_array, &array); } -- cgit v1.2.3