Commit: 9e1065ead2aceeaa99a708f0cb1b65fbd771d50a
Author: Bastien Montagne
Date:   Tue Feb 9 15:36:15 2021 +0100
Branches: master
https://developer.blender.org/rB9e1065ead2aceeaa99a708f0cb1b65fbd771d50a

LibOverride: cleanup: code consistency.

Properly fully extract
`lib_override_hierarchy_dependencies_recursive_tag` from
`lib_override_linked_group_tag`.

Was supposed to be that way already (see comment of
`lib_override_linked_group_tag`), for some reasons this case was missed.

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

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 6911248d198..576fac8a641 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -503,8 +503,6 @@ static void lib_override_linked_group_tag(
     }
   }
 
-  lib_override_hierarchy_dependencies_recursive_tag(bmain, id, tag, 
missing_tag);
-
   if (create_bmain_relations) {
     BKE_main_relations_free(bmain);
   }
@@ -795,6 +793,9 @@ bool BKE_lib_override_library_resync(Main *bmain, Scene 
*scene, ViewLayer *view_
 
   lib_override_linked_group_tag(bmain, id_root_reference, LIB_TAG_DOIT, 
LIB_TAG_MISSING, false);
 
+  lib_override_hierarchy_dependencies_recursive_tag(
+      bmain, id_root_reference, LIB_TAG_DOIT, LIB_TAG_MISSING);
+
   /* Make a mapping 'linked reference IDs' -> 'Local override IDs' of existing 
overrides. */
   GHash *linkedref_to_old_override = BLI_ghash_new(
       BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, __func__);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to