[Bf-blender-cvs] [74420d95b32] blender-v3.2-release: Revert "Fix liboverride extreme resync times in case of libraries dependency loops."

[Bastien Montagne]

Commit: 74420d95b32a2d91af52fcf6e2fa0c4d0a53469e
Author: Bastien Montagne
Date:   Thu May 19 11:51:01 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB74420d95b32a2d91af52fcf6e2fa0c4d0a53469e

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

This reverts commit e42e4e8568edeb4e0b962e2059586c2a3d3b457d.

Wrong commit, sorry for the noise.

===================================================================

M	source/blender/blenkernel/intern/lib_override.c

===================================================================

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;
     }