blender/blender
blender/blender
195
619
Fork 965
Code Issues 6.4k Pull Requests 1.1k Projects 22 Wiki Activity

LibOverride: Minor resync optimization by removing unuecessary processing.

Browse Source 
Not much to gain here, but can make resync faster by a few percents when
dealing with linked overrides and such.
This commit is contained in:
Bastien Montagne 2022-08-30 15:17:16 +02:00
parent 34ff27025d
commit afa4f8f3ce
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1802,6 +1802,10 @@ static bool lib_override_library_resync(Main *bmain,
lib_override_hierarchy_dependencies_recursive_tag(&data);
FOREACH_MAIN_ID_BEGIN (bmain, id) {
if ((id->lib != id_root->lib) || !ID_IS_OVERRIDE_LIBRARY(id)) {
continue;
}
/* IDs that get fully removed from linked data remain as local overrides (using place-holder
* linked IDs as reference), but they are often not reachable from any current valid local
* override hierarchy anymore. This will ensure they get properly deleted at the end of this
@ -1815,10 +1819,6 @@ static bool lib_override_library_resync(Main *bmain,
id->tag |= LIB_TAG_MISSING;
}
if ((id->lib != id_root->lib) || !ID_IS_OVERRIDE_LIBRARY(id)) {
continue;
}
/* While this should not happen in typical cases (and won't be properly supported here),
* user is free to do all kind of very bad things, including having different local
* overrides of a same linked ID in a same hierarchy. */
@ -2401,6 +2401,11 @@ static void lib_override_library_main_resync_on_library_indirect_level(
if (!ID_IS_OVERRIDE_LIBRARY_REAL(id)) {
continue;
}
if (!lib_override_resync_id_lib_level_is_valid(id, library_indirect_level, true)) {
continue;
}
if (id->tag & (LIB_TAG_DOIT | LIB_TAG_MISSING)) {
/* We already processed that ID as part of another ID's hierarchy. */
continue;