[Bf-blender-cvs] [20e982e78d7] blender-v2.91-release: Fix T77161: Outliner - Hiding a Collection does not gray out children objects
Manuel Castilla
noreply at git.blender.org
Tue Nov 3 06:57:00 CET 2020
Commit: 20e982e78d71c5d55b041ddfef0de306d779469a
Author: Manuel Castilla
Date: Mon Nov 2 22:52:53 2020 -0700
Branches: blender-v2.91-release
https://developer.blender.org/rB20e982e78d71c5d55b041ddfef0de306d779469a
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
===================================================================
M 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;
}
}
More information about the Bf-blender-cvs
mailing list