From 79927e730ea3c72f7c4b5f1cf85c8d8c1c940b14 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 26 Jan 2022 16:18:27 +0100 Subject: LibOverride: Resync: Do not process overrides that should already have been resynced. Those cases are almost always synptoms of either bug in code, or broken files. Re-doin resync on them only costs time and causes extra trash data as a result, without really helping in any way. --- source/blender/blenkernel/intern/lib_override.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index bc897e9075b..d1375b1e5b5 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -1553,11 +1553,13 @@ static void lib_override_resync_tagging_finalize_recurse(Main *bmain, CLOG_ERROR( &LOG, "While processing indirect level %d, ID %s from lib %s of indirect level %d detected " - "as needing resync.", + "as needing resync, skipping.", library_indirect_level, id->name, id->lib->filepath, id->lib->temp_index); + id->tag &= ~LIB_TAG_LIB_OVERRIDE_NEED_RESYNC; + return; } MainIDRelationsEntry *entry = BLI_ghash_lookup(bmain->relations->relations_from_pointers, id); -- cgit v1.2.3