diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-02-27 23:13:49 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-02-27 23:15:49 +0300 |
commit | c24b4e0cd0f95687ced252477232166dd53a341b (patch) | |
tree | f0a110ba91253c930f1e2333b5ccfb1d5863b767 | |
parent | 6ab9af0083a947b88ef71b247ce1853145351890 (diff) |
Outliner: Rename "Collections" display mode to "Active Render Layer"
-rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index a267dab0a48..a8ef0c1a8a8 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 == 'COLLECTIONS': + elif space.display_mode == 'ACT_LAYER': row = layout.row(align=True) row.operator("outliner.collection_new", text="", icon='NEW') diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index d63eab5e076..8a2272bf69a 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -62,7 +62,7 @@ static int outliner_item_drag_drop_poll(bContext *C) SpaceOops *soops = CTX_wm_space_outliner(C); return ED_operator_outliner_active(C) && /* Only collection display mode supported for now. Others need more design work */ - ELEM(soops->outlinevis, SO_COLLECTIONS); + ELEM(soops->outlinevis, SO_ACT_LAYER); } static TreeElement *outliner_item_drag_element_find(SpaceOops *soops, ARegion *ar, const wmEvent *event) diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index f19d6c1e8a8..81fda948bc4 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1405,7 +1405,7 @@ static void outliner_add_collections_recursive(SpaceOops *soops, ListBase *tree, } } -static void outliner_add_collections(SpaceOops *soops, SceneLayer *layer, Scene *scene) +static void outliner_add_collections_act_layer(SpaceOops *soops, SceneLayer *layer, Scene *scene) { outliner_add_collections_recursive(soops, &soops->tree, scene, &layer->layer_collections, NULL); } @@ -1863,8 +1863,8 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SceneLayer *sl, SpaceOops else if (soops->outlinevis == SO_ID_ORPHANS) { outliner_add_orphaned_datablocks(mainvar, soops); } - else if (soops->outlinevis == SO_COLLECTIONS) { - outliner_add_collections(soops, BKE_scene_layer_context_active(scene), scene); + else if (soops->outlinevis == SO_ACT_LAYER) { + outliner_add_collections_act_layer(soops, BKE_scene_layer_context_active(scene), scene); } else { ten = outliner_add_element(soops, &soops->tree, OBACT_NEW, NULL, 0, 0); diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 350b9675e9e..ce908b94d8d 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -289,7 +289,7 @@ typedef enum eSpaceOutliner_Mode { SO_USERDEF = 12, /* SO_KEYMAP = 13, */ /* deprecated! */ SO_ID_ORPHANS = 14, - SO_COLLECTIONS = 15, + SO_ACT_LAYER = 15, } eSpaceOutliner_Mode; /* SpaceOops->storeflag */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 07a1a73358d..0192ed887bb 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2105,7 +2105,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_USERDEF, "USER_PREFERENCES", 0, "User Preferences", "Display user preference data"}, {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_COLLECTIONS, "COLLECTIONS", 0, "Collections", "Display the collections of the active render layer"}, + {SO_ACT_LAYER, "ACT_LAYER", 0, "Active Render Layer", "Display the collections of the active render layer"}, {0, NULL, 0, NULL, NULL} }; |