From e8d75b957f5200ea33449201db966d40247d9454 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 28 Jun 2021 16:58:50 +0200 Subject: Fix UI glitch in outliner when hiding excluded collections. In ViewLayer view, overrides of excluded collections would then show one level higher, due to bad handling of those excluded collection in draw code. Reported by studio, thanks. @jbakker should be backported to 2.93LTS. --- .../blender/editors/space_outliner/tree/tree_display_view_layer.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc index f6cf951498c..402526bbe8d 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc @@ -172,8 +172,9 @@ void TreeDisplayViewLayer::add_layer_collections_recursive(ListBase &tree, add_layer_collection_objects(ten->subtree, *lc, *ten); } - const bool lib_overrides_visible = !SUPPORT_FILTER_OUTLINER(&space_outliner_) || - ((space_outliner_.filter & SO_FILTER_NO_LIB_OVERRIDE) == 0); + const bool lib_overrides_visible = !exclude && (!SUPPORT_FILTER_OUTLINER(&space_outliner_) || + ((space_outliner_.filter & + SO_FILTER_NO_LIB_OVERRIDE) == 0)); if (lib_overrides_visible && ID_IS_OVERRIDE_LIBRARY_REAL(&lc->collection->id)) { outliner_add_element( -- cgit v1.2.3