From 4c83e6bac09fd9d7c973cbe056880d68f9944ae2 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Thu, 27 Feb 2020 18:32:56 +0100 Subject: Fix T71611: Outliner - Show only Visible/Hidden Objects not working when hiding Collections Use BASE_VISIBLE_VIEWLAYER (rather than BASE_VISIBLE_DEPSGRAPH -- which is not including the 'Hide in Viewport') Note: the is one case where this still 'fails': - 'Show only Hidden' plus excluding the parent collection (would be nice to show those -- but contents of excluded excluded collections dont get show in any case... this would be more work and for another report...) Maniphest Tasks: T71611 Differential Revision: https://developer.blender.org/D6953 --- source/blender/editors/space_outliner/outliner_tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 8142d86aac8..4f896424f08 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -2090,12 +2090,12 @@ static bool outliner_element_visible_get(ViewLayer *view_layer, } if (exclude_filter & SO_FILTER_OB_STATE_VISIBLE) { - if ((base->flag & BASE_VISIBLE_DEPSGRAPH) == 0) { + if ((base->flag & BASE_VISIBLE_VIEWLAYER) == 0) { return false; } } else if (exclude_filter & SO_FILTER_OB_STATE_HIDDEN) { - if ((base->flag & BASE_VISIBLE_DEPSGRAPH) != 0) { + if ((base->flag & BASE_VISIBLE_VIEWLAYER) != 0) { return false; } } -- cgit v1.2.3