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:
authorDalai Felinto <dfelinto@gmail.com>2019-05-24 23:30:39 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-05-24 23:49:13 +0300
commit5df4c0a4693c668645728de2d909f2c65907c054 (patch)
tree4964714d0ec1f12fc1528d3a14b5b4506d098181 /source
parent483ae407d9d1b2b173face0efb96f2d287d51ea4 (diff)
Outliner: Fix selecting collections in view layer selecting original objects
Part of T64438.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_select.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index ae17158829c..bee615108f9 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1132,7 +1132,7 @@ static void do_outliner_item_activate_tree_element(bContext *C,
WM_window_set_active_scene(CTX_data_main(C), C, CTX_wm_window(C), (Scene *)tselem->id);
}
}
- else if (te->idcode == ID_GR) {
+ else if ((te->idcode == ID_GR) && (soops->outlinevis != SO_VIEW_LAYER)) {
Collection *gr = (Collection *)tselem->id;
if (extend) {