[Bf-blender-cvs] [79927e730ea] master: LibOverride: Resync: Do not process overrides that should already have been resynced.

[Bastien Montagne]

Commit: 79927e730ea3c72f7c4b5f1cf85c8d8c1c940b14
Author: Bastien Montagne
Date:   Wed Jan 26 16:18:27 2022 +0100
Branches: master
https://developer.blender.org/rB79927e730ea3c72f7c4b5f1cf85c8d8c1c940b14

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.

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

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