[Bf-blender-cvs] [fbc3e0c92fb] temp-outliner-library-override-hierarchy: Merge branch 'master' into temp-outliner-library-override-hierarchy

[Julian Eisel]

Commit: fbc3e0c92fb9a1e5c0a70442c85527b9efb3c3ae
Author: Julian Eisel
Date:   Wed Mar 30 21:02:30 2022 +0200
Branches: temp-outliner-library-override-hierarchy
https://developer.blender.org/rBfbc3e0c92fb9a1e5c0a70442c85527b9efb3c3ae

Merge branch 'master' into temp-outliner-library-override-hierarchy

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



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

diff --cc release/scripts/startup/bl_ui/space_outliner.py
index 86c1570ce60,0f3dc1f8794..55926980b3b
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@@ -370,7 -364,7 +370,7 @@@ class OUTLINER_PT_filter(Panel)
          col.prop(space, "use_filter_complete", text="Exact Match")
          col.prop(space, "use_filter_case_sensitive", text="Case Sensitive")
  
-         if display_mode in {'LIBRARY_OVERRIDES'} and space.lib_override_view_mode in {'PROPERTIES'} and bpy.data.libraries:
 -        if display_mode == 'LIBRARY_OVERRIDES' and bpy.data.libraries:
++        if display_mode == 'LIBRARY_OVERRIDES' and space.lib_override_view_mode == 'PROPERTIES' and bpy.data.libraries:
              col.separator()
              row = col.row()
              row.label(icon='LIBRARY_DATA_OVERRIDE')