archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BLI_array: add BLI_array_trim utility to re-allocate the current size

Browse Source 
Use this in BKE_view_layer_array_* functions.
This commit is contained in:
Campbell Barton
2022-02-20 21:29:00 +11:00
parent 7b11c71729
commit 1884f6e729
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/intern/layer_utils.c
View File

@@ -67,9 +67,11 @@ Object **BKE_view_layer_array_selected_objects_params(
}
FOREACH_SELECTED_OBJECT_END;
object_array = MEM_reallocN(object_array, sizeof(*object_array) * BLI_array_len(object_array));
/* We always need a valid allocation (prevent crash on free). */
if (object_array == NULL) {
if (object_array != NULL) {
BLI_array_trim(object_array);
}
else {
/* We always need a valid allocation (prevent crash on free). */
object_array = MEM_mallocN(0, __func__);
}
*r_len = BLI_array_len(object_array);
@@ -121,9 +123,11 @@ Base **BKE_view_layer_array_from_bases_in_mode_params(ViewLayer *view_layer,
}
FOREACH_BASE_IN_MODE_END;
base_array = MEM_reallocN(base_array, sizeof(*base_array) * BLI_array_len(base_array));
/* We always need a valid allocation (prevent crash on free). */
if (base_array == NULL) {
if (base_array != NULL) {
BLI_array_trim(base_array);
}
else {
base_array = MEM_mallocN(0, __func__);
}
*r_len = BLI_array_len(base_array);