blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Revert "Fix liboverride extreme resync times in case of libraries dependency loops." 

This reverts commit e42e4e8568.

Wrong commit, sorry for the noise.
This commit is contained in:
Bastien Montagne 2022-05-19 11:51:01 +02:00
parent e42e4e8568
commit 74420d95b3
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2335,7 +2335,6 @@ static int lib_override_sort_libraries_func(LibraryIDLinkCallbackData *cb_data)
if (id != NULL && ID_IS_LINKED(id) && id->lib != id_owner->lib) {
const int owner_library_indirect_level = ID_IS_LINKED(id_owner) ? id_owner->lib->temp_index :
0;
<<<<<<< Updated upstream
if (owner_library_indirect_level > 10000) {
CLOG_ERROR(
&LOG,
@ -2344,17 +2343,6 @@ static int lib_override_sort_libraries_func(LibraryIDLinkCallbackData *cb_data)
id_owner->lib->filepath,
id->lib->filepath);
BLI_assert(0);
=======
if (owner_library_indirect_level > 200) {
CLOG_ERROR(&LOG,
"Levels of indirect usages of libraries is way too high, there are most likely "
"dependency loops, skipping further building loops (involves at least '%s' from "
"'%s' and '%s' from '%s')",
id_owner->name,
id_owner->lib->filepath,
id->name,
id->lib->filepath);
>>>>>>> Stashed changes
return IDWALK_RET_NOP;
}