[Bf-blender-cvs] [a449214854] blender2.8: Outliner: Rename "All Collections" display mode to "Master Collection Tree"

[Julian Eisel]

Commit: a44921485430fce94af691c8d063f6207e5bc562
Author: Julian Eisel
Date:   Wed Mar 15 20:43:04 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBa44921485430fce94af691c8d063f6207e5bc562

Outliner: Rename "All Collections" display mode to "Master Collection Tree"

Also don't show alphabetical sorting option for "Active Render Layer" mode.

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

M	release/scripts/startup/bl_ui/space_outliner.py
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 7bfa3eb5d6..1e38338e36 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -60,7 +60,7 @@ class OUTLINER_HT_header(Header):
         elif space.display_mode == 'ORPHAN_DATA':
             layout.operator("outliner.orphans_purge")
 
-        elif space.display_mode in {'ACT_LAYER', 'COLLECTIONS'}:
+        elif space.display_mode in {'ACT_LAYER', 'MASTER_COLLECTION'}:
             row = layout.row(align=True)
 
             row.operator("outliner.collection_new", text="", icon='NEW')
@@ -98,7 +98,7 @@ class OUTLINER_MT_view(Menu):
         space = context.space_data
 
         if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}:
-            if space.display_mode != 'COLLECTIONS':
+            if space.display_mode not in {'ACT_LAYER', 'MASTER_COLLECTION'}:
                 layout.prop(space, "use_sort_alpha")
             layout.prop(space, "show_restrict_columns")
             layout.separator()
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index cb57893e5b..698a8ef50a 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2111,8 +2111,8 @@ static void rna_def_space_outliner(BlenderRNA *brna)
 		{SO_ID_ORPHANS, "ORPHAN_DATA", 0, "Orphan Data",
 		                "Display data-blocks which are unused and/or will be lost when the file is reloaded"},
 		{SO_ACT_LAYER, "ACT_LAYER", 0, "Active Render Layer", "Display the collections of the active render layer"},
-		{SO_COLLECTIONS, "COLLECTIONS", 0, "All Collections", "Display all collections based on the master "
-		                 "collection hierarchy"},
+		{SO_COLLECTIONS, "MASTER_COLLECTION", 0, "Master Collection Tree", "Display all collections based on the "
+		                 "master collection hierarchy"},
 		{0, NULL, 0, NULL, NULL}
 	};