blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

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

This is part of T53495.
This commit is contained in:
Dalai Felinto 2018-01-05 19:17:38 -02:00
parent fb4cd136a7
commit 84d4476eb1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/space_outliner.py
View File

@ -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()

2
source/blender/makesrna/intern/rna_space.c
View File

@ -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}
};