[Bf-blender-cvs] [5df4c0a4693] master: Outliner: Fix selecting collections in view layer selecting original objects

Dalai Felinto noreply at git.blender.org
Fri May 24 23:51:46 CEST 2019


Commit: 5df4c0a4693c668645728de2d909f2c65907c054
Author: Dalai Felinto
Date:   Fri May 24 17:30:39 2019 -0300
Branches: master
https://developer.blender.org/rB5df4c0a4693c668645728de2d909f2c65907c054

Outliner: Fix selecting collections in view layer selecting original objects

Part of T64438.

===================================================================

M	source/blender/editors/space_outliner/outliner_select.c

===================================================================

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) {



More information about the Bf-blender-cvs mailing list