[Bf-blender-cvs] [84d4476eb11] blender2.8: Outliner: Rename "Master Collection Tree" to "Collections"

[Dalai Felinto]

Commit: 84d4476eb11cddcc88c8271c22bb8d1051421f0d
Author: Dalai Felinto
Date:   Fri Jan 5 19:17:38 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB84d4476eb11cddcc88c8271c22bb8d1051421f0d

Outliner: Rename "Master Collection Tree" to "Collections"

This is part of T53495.

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

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 b1ab55b7ed1..1af515b0a29 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -87,7 +87,7 @@ class OUTLINER_MT_editor_menus(Menu):
         if space.display_mode == 'DATABLOCKS':
             layout.menu("OUTLINER_MT_edit_datablocks")
 
-        elif space.display_mode == 'MASTER_COLLECTION':
+        elif space.display_mode == 'COLLECTIONS':
             layout.menu("OUTLINER_MT_edit_collections")
 
 
@@ -100,7 +100,7 @@ class OUTLINER_MT_view(Menu):
         space = context.space_data
 
         if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}:
-            if space.display_mode not in {'ACT_LAYER', 'MASTER_COLLECTION'}:
+            if space.display_mode not in {'ACT_LAYER', 'COLLECTIONS'}:
                 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 aa3f159af40..d28ebb5aadf 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2116,7 +2116,7 @@ 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 View Layer", "Display the collections of the active view layer"},
-		{SO_COLLECTIONS, "MASTER_COLLECTION", 0, "Master Collection Tree", "Display all collections based on the "
+		{SO_COLLECTIONS, "COLLECTIONS", 0, "Collections", "Display all collections based on the "
 		                 "master collection hierarchy"},
 		{0, NULL, 0, NULL, NULL}
 	};