sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T81168: 2.8x Crash when loading 2.79 file.

Browse Source 
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.
This commit is contained in:
Bastien Montagne 2020-09-26 09:21:27 +02:00
parent 83dc97ccc0
commit 0295e14f5f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenloader/intern/versioning_280.c
View File

@ -1242,7 +1242,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];