[Bf-blender-cvs] [8b5292a60e5] master: Outliner: Don't show indirectly linked Library Overrides properties

[Julian Eisel]

Commit: 8b5292a60e5de72d91c4c7e2c7a27a3335290c2c
Author: Julian Eisel
Date:   Mon Mar 28 16:55:17 2022 +0200
Branches: master
https://developer.blender.org/rB8b5292a60e5de72d91c4c7e2c7a27a3335290c2c

Outliner: Don't show indirectly linked Library Overrides properties

The Library Overrides display mode is meant to show overridden
properties from the current file only, not library overrides in
data-blocks that just were linked in. The upcoming Hierarchies view mode
for Library Overrides will also display linked in data-blocks that have
overrides in the source file (but not the individual overridden
properties), see T95802.

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

M	source/blender/editors/space_outliner/tree/tree_display_override_library.cc

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

diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library.cc
index b5c0a10c834..2162c303da1 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_override_library.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_override_library.cc
@@ -69,7 +69,7 @@ ListBase TreeDisplayOverrideLibrary::add_library_contents(Main &mainvar)
 
     /* check if there's data in current id list */
     for (ID *id_iter : List<ID>(lbarray[a])) {
-      if (ID_IS_OVERRIDE_LIBRARY_REAL(id_iter)) {
+      if (ID_IS_OVERRIDE_LIBRARY_REAL(id_iter) && !ID_IS_LINKED(id_iter)) {
         id = id_iter;
         break;
       }
@@ -93,7 +93,7 @@ ListBase TreeDisplayOverrideLibrary::add_library_contents(Main &mainvar)
     }
 
     for (ID *id : List<ID>(lbarray[a])) {
-      if (ID_IS_OVERRIDE_LIBRARY_REAL(id)) {
+      if (ID_IS_OVERRIDE_LIBRARY_REAL(id) && !ID_IS_LINKED(id)) {
         TreeElement *override_tree_element = outliner_add_element(
             &space_outliner_, lb_to_expand, id, id_base_te, TSE_LIBRARY_OVERRIDE_BASE, 0);