[Bf-blender-cvs] [78e14e6af80] override-recursive-resync: Merge branch 'master' into override-recursive-resync

[Bastien Montagne]

Commit: 78e14e6af800c1aa19c5c10e0c27d06a75df9e0a
Author: Bastien Montagne
Date:   Wed May 26 15:50:52 2021 +0200
Branches: override-recursive-resync
https://developer.blender.org/rB78e14e6af800c1aa19c5c10e0c27d06a75df9e0a

Merge branch 'master' into override-recursive-resync

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



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

diff --cc source/blender/blenkernel/intern/lib_override.c
index dec1d2b4959,1d7c4c3ef6b..22ba91839e0
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@@ -639,18 -602,22 +640,18 @@@ static void lib_override_local_group_ta
        continue;
      }
  
-     Library *reference_lib = lib_override_get(id_owner)->reference->lib;
 -    /* Do not tag 'virtual' overrides (shape keys here, as we already rejected embedded case
 -     * above). */
 -    if (ID_IS_OVERRIDE_LIBRARY_REAL(to_id)) {
 -      Library *reference_lib = lib_override_get(bmain, id_owner)->reference->lib;
 -      ID *to_id_reference = lib_override_get(bmain, to_id)->reference;
 -      if (to_id_reference->lib != reference_lib) {
 -        /* We do not override data-blocks from other libraries, nor do we process them. */
 -        continue;
 -      }
++    Library *reference_lib = lib_override_get(bmain, id_owner)->reference->lib;
 +    ID *to_id_reference = lib_override_get(to_id)->reference;
 +    if (to_id_reference->lib != reference_lib) {
 +      /* We do not override data-blocks from other libraries, nor do we process them. */
 +      continue;
 +    }
  
 -      if (to_id_reference->tag & LIB_TAG_MISSING) {
 -        to_id->tag |= missing_tag;
 -      }
 -      else {
 -        to_id->tag |= tag;
 -      }
 +    if (to_id_reference->tag & LIB_TAG_MISSING) {
 +      to_id->tag |= missing_tag;
 +    }
 +    else {
 +      to_id->tag |= tag;
      }
  
      /* Recursively process the dependencies. */