From b72df3a4a4ad2e88eac27dc72fad6942555da2ee Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 26 Sep 2020 09:21:27 +0200 Subject: Fix T81168: 2.8x Crash when loading 2.79 file. Object in the 2.7x file is on no layer at all, while this is not really expected nor considered valid, better to cope with the case gracefully than crash. To be backported to 2.90 and 2.83. --- source/blender/blenloader/intern/versioning_280.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index d7a5d54b3f6..f141050f6b7 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1241,7 +1241,12 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports)) break; } } - BLI_assert(collection_hidden != NULL); + if (collection_hidden == NULL) { + /* This should never happen (objects are always supposed to be instantiated in a + * scene), but it does sometimes, see e.g. T81168. + * Just put them in first hidden collection in those cases. */ + collection_hidden = &hidden_collection_array[0]; + } if (*collection_hidden == NULL) { char name[MAX_ID_NAME]; -- cgit v1.2.3