diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-28 12:26:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-28 12:26:40 +0300 |
| commit | ff0a29df1458c0890c6f4f6f2fd252765d142423 (patch) | |
| tree | 6e021d9310d7c9452611d2fa6e330c59bb0ec957 /source/blender/blenkernel/intern/layer_utils.c | |
| parent | 78a6c2e12c8d144d10f759d05cbb3503f555883b (diff) | |
Fix crash entering editmode
Diffstat (limited to 'source/blender/blenkernel/intern/layer_utils.c')
| -rw-r--r-- | source/blender/blenkernel/intern/layer_utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c index 556ccdd3f92..2d446af9ac8 100644 --- a/source/blender/blenkernel/intern/layer_utils.c +++ b/source/blender/blenkernel/intern/layer_utils.c @@ -75,8 +75,10 @@ Base **BKE_view_layer_array_from_bases_in_mode_params( BLI_array_append(base_array, base_iter); } FOREACH_BASE_IN_MODE_END; - if (base_array != NULL) { - base_array = MEM_reallocN(base_array, sizeof(*base_array) * BLI_array_len(base_array)); + 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) { + base_array = MEM_mallocN(0, __func__); } *r_len = BLI_array_len(base_array); return base_array; |