diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-23 21:39:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-24 15:01:51 +0300 |
| commit | c56bbf60d85f502e4fecef70060e0d450be2c239 (patch) | |
| tree | 6ab0eb774498b637c23dbf9768392e41ba63d461 /source/blender/makesdna/DNA_outliner_types.h | |
| parent | d67b120f172290fc7a1b4cfb5432e03017426f6e (diff) | |
Outliner: reorganize collection related display modes.
* "Scenes" now shows for each scene lists of all view layers, collections and
objects contained in it. This is the place to see all collections and objects
in the scene even if they are not used in any view layer. Objects are nested
according to parenting here.
* "Collections" now shows all collections in the view layer, and the objects
in those collections. Objects are not nested by parenting, only collections
since it would be too confusing if the children are in a different collection.
* "Groups" is unchanged.
* "View Layer" was removed, replaced by "Collections".
Part of T54790.
Diffstat (limited to 'source/blender/makesdna/DNA_outliner_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_outliner_types.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index 8e48bbdde1a..b968bcebeb5 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -84,7 +84,7 @@ enum { #define TSE_PROXY 18 #define TSE_R_LAYER_BASE 19 #define TSE_R_LAYER 20 -#define TSE_R_PASS 21 +/* #define TSE_R_PASS 21 */ /* UNUSED */ #define TSE_LINKED_MAT 22 /* NOTE, is used for light group */ #define TSE_LINKED_LAMP 23 @@ -102,9 +102,10 @@ enum { #define TSE_KEYMAP_ITEM 35 /* NO ID */ #define TSE_ID_BASE 36 /* NO ID */ #define TSE_GP_LAYER 37 /* NO ID */ -#define TSE_LAYER_COLLECTION 38 -#define TSE_SCENE_COLLECTION 39 +#define TSE_LAYER_COLLECTION 38 +#define TSE_SCENE_COLLECTION 39 #define TSE_LAYER_COLLECTION_BASE 40 +#define TSE_SCENE_OBJECTS_BASE 41 /* Check whether given TreeStoreElem should have a real ID in its ->id member. */ |