From 20e982e78d71c5d55b041ddfef0de306d779469a Mon Sep 17 00:00:00 2001 From: Manuel Castilla Date: Mon, 2 Nov 2020 22:52:53 -0700 Subject: Fix T77161: Outliner - Hiding a Collection does not gray out children objects Ensure that When checking "Hide in Viewport" option for a collection that child objects are drawn grayed out for consistency with the "Disable in Viewports" toggle. For checking an object visibility in the viewport the flag BASE_VISIBLE_VIEWLAYER should be used instead of BASE_VISIBLE_DEPSGRAPH because the latter ignores viewport visibility. Manifest Task: T77161 Differential Revision: https://developer.blender.org/D7904 --- source/blender/editors/space_outliner/outliner_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_outliner/outliner_tree.c') diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index c44a1554478..4fbb394c38f 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1556,7 +1556,7 @@ static void outliner_add_layer_collection_objects(SpaceOutliner *space_outliner, TreeElement *te_object = outliner_add_element(space_outliner, tree, base->object, ten, 0, 0); te_object->directdata = base; - if (!(base->flag & BASE_VISIBLE_DEPSGRAPH)) { + if (!(base->flag & BASE_VISIBLE_VIEWLAYER)) { te_object->flag |= TE_DISABLED; } } -- cgit v1.2.3