[Bf-blender-cvs] [4fc96e5000c] master: Merge branch 'blender-v3.2-release'

[Bastien Montagne]

Commit: 4fc96e5000ce037b0247199e2c9fc440fbcc713f
Author: Bastien Montagne
Date:   Thu May 19 12:04:07 2022 +0200
Branches: master
https://developer.blender.org/rB4fc96e5000ce037b0247199e2c9fc440fbcc713f

Merge branch 'blender-v3.2-release'

Conflicts:
	source/blender/blenkernel/intern/lib_override.c

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



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

diff --cc source/blender/blenkernel/intern/lib_override.c
index 608c3949858,768ac4f606f..6dd13952413
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@@ -2349,13 -2335,16 +2349,15 @@@ static int lib_override_sort_libraries_
    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;
-     if (owner_library_indirect_level > 10000) {
-       CLOG_ERROR(
-           &LOG,
-           "Levels of indirect usages of libraries is way too high, skipping further building "
-           "loops (Involves at least '%s' and '%s')",
-           id_owner->lib->filepath,
-           id->lib->filepath);
+     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);
 -      BLI_assert(0);
        return IDWALK_RET_NOP;
      }