diff options
author | Bastien Montagne <bastien@blender.org> | 2022-05-19 13:04:07 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-05-19 13:04:07 +0300 |
commit | 4fc96e5000ce037b0247199e2c9fc440fbcc713f (patch) | |
tree | 3fb955f92ce61478faf6c68d25c05485352fc98b /source/blender/blenkernel/intern/lib_override.c | |
parent | f4cbfaded657886efa373a1fdbb45042be8e6c5c (diff) | |
parent | 24745e8d27903ae741565c5e15f147d206a1030e (diff) |
Merge branch 'blender-v3.2-release'
Conflicts:
source/blender/blenkernel/intern/lib_override.c
Diffstat (limited to 'source/blender/blenkernel/intern/lib_override.c')
-rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 608c3949858..6dd13952413 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -2349,13 +2349,15 @@ 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; - 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); return IDWALK_RET_NOP; } |