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

LibOverride: Do not assert on invalid resync situation.

Browse Source 
Some checks here are really critical and should assert, but that one is
more an indication that something is not going right, though data itself
should still be mostly valid, so better warn the user with a LOG
warning, than be silent in release builds, and crash in debug ones.
This commit is contained in:
Bastien Montagne
2023-03-09 16:31:07 +01:00
parent dcfc9629c2
commit ebc062191c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/lib_override.cc
View File

@@ -2525,8 +2525,16 @@ static void lib_override_library_main_resync_on_library_indirect_level(
BLI_assert(id_resync_root_iter == id_resync_roots->list &&
id_resync_root_iter == id_resync_roots->last_node);
}
BLI_assert(!lib_override_resync_tagging_finalize_recurse(
bmain, id_resync_root, id_roots, library_indirect_level, true));
if (lib_override_resync_tagging_finalize_recurse(
bmain, id_resync_root, id_roots, library_indirect_level, true)) {
CLOG_WARN(&LOG,
"Resync root ID still has ancestors tagged for resync, this should not happen "
"at this point."
"\n\tRoot ID: %s"
"\n\tResync root ID: %s",
id_root->name,
id_resync_root->name);
}
}
BLI_ghashIterator_step(id_roots_iter);
}