Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +10 -2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ebc062191c - Show all commits

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 && BLI_assert(id_resync_root_iter == id_resync_roots->list &&
id_resync_root_iter == id_resync_roots->last_node); id_resync_root_iter == id_resync_roots->last_node);
} }
BLI_assert(!lib_override_resync_tagging_finalize_recurse( if (lib_override_resync_tagging_finalize_recurse(
bmain, id_resync_root, id_roots, library_indirect_level, true)); 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); BLI_ghashIterator_step(id_roots_iter);
} }