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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-23 21:39:05 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-24 15:01:51 +0300
commitc56bbf60d85f502e4fecef70060e0d450be2c239 (patch)
tree6ab0eb774498b637c23dbf9768392e41ba63d461 /source/blender/makesrna/intern/rna_space.c
parentd67b120f172290fc7a1b4cfb5432e03017426f6e (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/makesrna/intern/rna_space.c')
-rw-r--r--source/blender/makesrna/intern/rna_space.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 8f95daf9f69..7b73125e738 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2007,10 +2007,8 @@ static void rna_def_space_outliner(BlenderRNA *brna)
PropertyRNA *prop;
static const EnumPropertyItem display_mode_items[] = {
- {SO_VIEW_LAYER, "VIEW_LAYER", 0, "View Layer", "Display the collections of the active view layer"},
- {SO_COLLECTIONS, "COLLECTIONS", 0, "Collections", "Display all collections based on the "
- "master collection hierarchy"},
- {SO_SCENES, "SCENES", 0, "Scenes", "Display composition related data in all scenes"},
+ {SO_COLLECTIONS, "COLLECTIONS", 0, "Collections", "Display collections in the view layer"},
+ {SO_SCENES, "SCENES", 0, "Scenes", "Display scenes and their view layers, collections and objects"},
{SO_GROUPS, "GROUPS", 0, "Groups", "Display groups and their data-blocks"},
{SO_SEQUENCE, "SEQUENCE", 0, "Sequence", "Display sequence data-blocks"},
{SO_LIBRARIES, "LIBRARIES", 0, "Blender File", "Display data of current file and linked libraries"},