Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-02-27 20:32:56 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-02-28 17:20:59 +0300
commit4c83e6bac09fd9d7c973cbe056880d68f9944ae2 (patch)
treefee839899cea193130c9cd7d9a1f487d8bf3489b /source
parent94dcfe7a776db49675556772ecaa273c8dda890e (diff)
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
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c4
1 files changed, 2 insertions, 2 deletions
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;
}
}