From 5138fe3c0a24d5890438eed90a70401d90423356 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 27 Feb 2017 22:17:19 +0100 Subject: 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". --- source/blender/makesdna/DNA_outliner_types.h | 3 ++- source/blender/makesdna/DNA_space_types.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index 8c9de0665c4..44844653f3b 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -99,7 +99,8 @@ enum { #define TSE_KEYMAP_ITEM 35 /* NO ID */ #define TSE_ID_BASE 36 /* NO ID */ #define TSE_GP_LAYER 37 /* NO ID */ -#define TSE_COLLECTION 38 /* NO ID */ +#define TSE_LAYER_COLLECTION 38 /* NO ID */ +#define TSE_SCENE_COLLECTION 39 /* NO ID */ /* Check whether given TreeStoreElem should have a real ID in its ->id member. */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index ce908b94d8d..10f41408f48 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -290,6 +290,7 @@ typedef enum eSpaceOutliner_Mode { /* SO_KEYMAP = 13, */ /* deprecated! */ SO_ID_ORPHANS = 14, SO_ACT_LAYER = 15, + SO_COLLECTIONS = 16, } eSpaceOutliner_Mode; /* SpaceOops->storeflag */ -- cgit v1.2.3