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
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-10-30 11:57:19 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-10-30 11:57:19 +0300
commit84386c45d83ddc722e33a4bbf133943921229b86 (patch)
tree77659b629e21b4dc3c209ce2e94b8330e1a78cdc /source/blender
parentdff7abf06109eef72e9ec01c42607a22702dd0a5 (diff)
parentd45c7c997f18d16cacd8e955e1a99b6bf521f637 (diff)
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/space_outliner/outliner_edit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index c55140db46f..34bbf3a2a30 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -1600,7 +1600,11 @@ static void tree_element_show_hierarchy(Scene *scene, SpaceOutliner *soops, List
for (te = lb->first; te; te = te->next) {
tselem = TREESTORE(te);
- if (tselem->type == 0) {
+ if (ELEM(tselem->type,
+ 0,
+ TSE_SCENE_OBJECTS_BASE,
+ TSE_VIEW_COLLECTION_BASE,
+ TSE_LAYER_COLLECTION)) {
if (te->idcode == ID_SCE) {
if (tselem->id != (ID *)scene) {
tselem->flag |= TSE_CLOSED;