diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2021-01-26 19:51:51 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2021-01-26 19:51:51 +0300 |
| commit | ae5c15bb4349426c5db276d7d73d750c43cc0346 (patch) | |
| tree | ea8f7afa1901ff5186e6aa3b846f07945ecb19ad /source/blender/blenkernel/intern/customdata.c | |
| parent | ff7a557c67096fc8de870e5fb43caa17b649c538 (diff) | |
| parent | 6d40d7218971b558074eb418afd244ab13ab8fbf (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 42f59a710c1..37e9c810123 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -5167,7 +5167,7 @@ void CustomData_blend_read(BlendDataReader *reader, CustomData *data, int count) if (CustomData_verify_versions(data, i)) { BLO_read_data_address(reader, &layer->data); - if (layer->data == NULL) { + if (layer->data == NULL && count > 0 && layer->type == CD_PROP_BOOL) { /* Usually this should never happen, except when a custom data layer has not been written * to a file correctly. */ CLOG_WARN(&LOG, "Reallocating custom data layer that was not saved correctly."); |