griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix (unreported) rare assert when loading blendfile using libraries.

Browse Source 
There is actually a valid (rare) case where a Library ID can have a `0`
versionfile value during blendfile loading: if that library only
contains 'indirect weak' linked data.

These IDs are only actually read in the library blendfile if they are
also used by some other data, otherwise they are purposedly dropped and
removed, and the library blendfile can end up never being read at all.

This would lead to a completely empty library on blendfile loading,
which can then be removed from the data-base.

NOTE: this _does not_ affect cases where the whole library is missing,
or some linked IDs from that library are not found anymore.
This commit is contained in:
Bastien Montagne
2024-11-12 19:59:32 +01:00
parent a0b2704202
commit 0565f16f18
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/blenloader/intern/readfile.cc
View File

@@ -3729,7 +3729,11 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath)
/* Yep, second splitting... but this is a very cheap operation, so no big deal. */
blo_split_main(&mainlist, bfd->main);
LISTBASE_FOREACH (Main *, mainvar, &mainlist) {
BLI_assert(mainvar->versionfile != 0);
/* Do versioning for newly added linked data-blocks. If no data-blocks were read from a
* library versionfile will still be zero and we can skip it. */
if (mainvar->versionfile == 0) {
continue;
}
do_versions_after_linking((mainvar->curlib && mainvar->curlib->runtime.filedata) ?
mainvar->curlib->runtime.filedata :
fd,
@@ -3745,12 +3749,33 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath)
BKE_main_id_refcount_recompute(bfd->main, false);
}
LISTBASE_FOREACH (Library *, lib, &bfd->main->libraries) {
LISTBASE_FOREACH_MUTABLE (Library *, lib, &bfd->main->libraries) {
/* Now we can clear this runtime library filedata, it is not needed anymore. */
if (lib->runtime.filedata) {
BLI_assert(lib->runtime.versionfile != 0);
blo_filedata_free(lib->runtime.filedata);
lib->runtime.filedata = nullptr;
}
/* If no data-blocks were read from a library (should only happen when all references to a
* library's data are `ID_FLAG_INDIRECT_WEAK_LINK`), its versionfile will still be zero and
* it can be deleted.
*
* NOTES:
* - In case the library blendfile exists but is missing all the referenced linked IDs, the
* placeholders IDs created will reference the library ID, and the library ID will have a
* valid version number as the file was read to search for the linked IDs.
* - In case the library blendfile does not exist, its local Library ID will get the version
* of the current local Main (i.e. the loaded blendfile). */
else if (lib->runtime.versionfile == 0) {
#ifndef NDEBUG
ID *id_iter;
FOREACH_MAIN_ID_BEGIN (bfd->main, id_iter) {
BLI_assert(id_iter->lib != lib);
}
FOREACH_MAIN_ID_END;
#endif
BKE_id_delete(bfd->main, lib);
}
}
if (bfd->main->is_read_invalid) {