diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-02-28 00:17:19 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-02-28 00:24:59 +0300 |
| commit | 5138fe3c0a24d5890438eed90a70401d90423356 (patch) | |
| tree | 1ebe19822d6e00dd4d4d2728baba476e04b0c3e7 /source/blender/editors/space_outliner/outliner_select.c | |
| parent | c24b4e0cd0f95687ced252477232166dd53a341b (diff) | |
Outliner: "All Collections" mode showing the master collection hierarchy
Reordering is disabled for now. Link, unlink and override operators
are only available while in "Active Layer" mode, not in "All
Collections".
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 85b4c33c3f1..0793ba50c32 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -848,7 +848,7 @@ eOLDrawState tree_element_type_active( case TSE_GP_LAYER: //return tree_element_active_gplayer(C, scene, s, te, tselem, set); break; - case TSE_COLLECTION: + case TSE_LAYER_COLLECTION: return tree_element_active_collection(C, te, tselem, set); } return OL_DRAWSEL_NONE; @@ -867,7 +867,7 @@ static void outliner_item_activate( /* always makes active object, except for some specific types. * Note about TSE_EBONE: In case of a same ID_AR datablock shared among several objects, we do not want * to switch out of edit mode (see T48328 for details). */ - if (!ELEM(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP, TSE_EBONE, TSE_COLLECTION)) { + if (!ELEM(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP, TSE_EBONE, TSE_LAYER_COLLECTION)) { tree_element_set_active_object(C, scene, sl, soops, te, (extend && tselem->type == 0) ? OL_SETSEL_EXTEND : OL_SETSEL_NORMAL, recursive && tselem->type == 0); |