diff options
author | Bastien Montagne <bastien@blender.org> | 2022-05-19 12:51:01 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-05-19 12:51:01 +0300 |
commit | 74420d95b32a2d91af52fcf6e2fa0c4d0a53469e (patch) | |
tree | 3485dd122be22958b868d7b4e2e5ce825358ba4e /source/blender/blenkernel/intern/lib_override.c | |
parent | e42e4e8568edeb4e0b962e2059586c2a3d3b457d (diff) |
Revert "Fix liboverride extreme resync times in case of libraries dependency loops."
This reverts commit e42e4e8568edeb4e0b962e2059586c2a3d3b457d.
Wrong commit, sorry for the noise.
Diffstat (limited to 'source/blender/blenkernel/intern/lib_override.c')
-rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 7dbde0e7e49..b83d30a27bf 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -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; } |