From 74f872df3a0d45cba58540f240101ce4724f11d0 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 18 Jan 2018 14:11:28 -0200 Subject: Outliner: Rename "Active View Layer" > "View Layer" The original name came from a cheap conversion of the "active layer" option to "active render layer" and then "active view layer". --- source/blender/blenloader/intern/versioning_280.c | 2 +- source/blender/editors/space_outliner/outliner_collections.c | 2 +- source/blender/editors/space_outliner/outliner_ops.c | 2 +- source/blender/editors/space_outliner/outliner_tools.c | 2 +- source/blender/editors/space_outliner/outliner_tree.c | 10 +++++----- source/blender/editors/space_outliner/space_outliner.c | 2 +- source/blender/makesdna/DNA_space_types.h | 2 +- source/blender/makesrna/intern/rna_space.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source') diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 31d3b48aee0..49cf86fc84c 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -503,7 +503,7 @@ void do_versions_after_linking_280(Main *main) if (view_layer->spacetype == SPACE_OUTLINER) { SpaceOops *soutliner = (SpaceOops *)view_layer; - soutliner->outlinevis = SO_ACT_LAYER; + soutliner->outlinevis = SO_VIEW_LAYER; if (BLI_listbase_count_ex(&layer->layer_collections, 2) == 1) { if (soutliner->treestore == NULL) { diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 3cf7a1ed2dc..3726d0f6294 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -100,7 +100,7 @@ static int collections_editor_poll(bContext *C) static int view_layer_editor_poll(bContext *C) { SpaceOops *so = CTX_wm_space_outliner(C); - return (so != NULL) && (so->outlinevis == SO_ACT_LAYER); + return (so != NULL) && (so->outlinevis == SO_VIEW_LAYER); } /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index 57c93e19612..9022552c429 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -58,7 +58,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 modes supported for now. Others need more design work */ - ELEM(soops->outlinevis, SO_ACT_LAYER, SO_COLLECTIONS, SO_GROUPS); + ELEM(soops->outlinevis, SO_VIEW_LAYER, SO_COLLECTIONS, SO_GROUPS); } static TreeElement *outliner_item_drag_element_find(SpaceOops *soops, ARegion *ar, const wmEvent *event) diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index a7a2765f7a5..eaa3267e99d 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1871,7 +1871,7 @@ static const EnumPropertyItem *outliner_collection_operation_type_itemf( switch (soops->outlinevis) { case SO_GROUPS: return prop_collection_op_group_internal_types; - case SO_ACT_LAYER: + case SO_VIEW_LAYER: return prop_collection_op_none_types; } return NULL; diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 5ce9d71ecd5..3fd044afe48 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1475,7 +1475,7 @@ static void outliner_add_layer_collections_recursive( outliner_make_hierarchy(&ten->subtree); } } -static void outliner_add_collections_act_layer(SpaceOops *soops, Scene *scene, ViewLayer *layer) +static void outliner_add_view_layer(SpaceOops *soops, Scene *scene, ViewLayer *layer) { outliner_add_layer_collections_recursive(soops, &soops->tree, &scene->id, &layer->layer_collections, NULL); } @@ -1572,7 +1572,7 @@ static TreeElement *outliner_add_scene_collection_recursive( return ten; } -static void outliner_add_collections_master(SpaceOops *soops, Scene *scene) +static void outliner_add_collections(SpaceOops *soops, Scene *scene) { SceneCollection *master_collection = BKE_collection_master(&scene->id); TreeElement *ten = outliner_add_scene_collection_recursive(soops, &soops->tree, &scene->id, master_collection, NULL); @@ -2022,11 +2022,11 @@ void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, Spa else if (soops->outlinevis == SO_ID_ORPHANS) { outliner_add_orphaned_datablocks(mainvar, soops); } - else if (soops->outlinevis == SO_ACT_LAYER) { - outliner_add_collections_act_layer(soops, scene, view_layer); + else if (soops->outlinevis == SO_VIEW_LAYER) { + outliner_add_view_layer(soops, scene, view_layer); } else if (soops->outlinevis == SO_COLLECTIONS) { - outliner_add_collections_master(soops, scene); + outliner_add_collections(soops, scene); } else { if (BASACT(view_layer)) { diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index ee86bddefa7..5d7494aee09 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -437,7 +437,7 @@ static void outliner_main_region_message_subscribe( .notify = ED_region_do_msg_notify_tag_redraw, }; - if (ELEM(soops->outlinevis, SO_ACT_LAYER, SO_COLLECTIONS)) { + if (ELEM(soops->outlinevis, SO_VIEW_LAYER, SO_COLLECTIONS)) { WM_msg_subscribe_rna_anon_prop(mbus, Window, view_layer, &msg_sub_value_region_tag_redraw); } } diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 39ac3f72b94..f994d78ed91 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -298,7 +298,7 @@ typedef enum eSpaceOutliner_Mode { SO_USERDEF = 12, /* SO_KEYMAP = 13, */ /* deprecated! */ SO_ID_ORPHANS = 14, - SO_ACT_LAYER = 15, + SO_VIEW_LAYER = 15, SO_COLLECTIONS = 16, } eSpaceOutliner_Mode; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 4190bb35a1e..92fb77da1bf 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2115,7 +2115,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_ACT_LAYER, "ACT_LAYER", 0, "Active View Layer", "Display the collections of the active view layer"}, + {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"}, {0, NULL, 0, NULL, NULL} -- cgit v1.2.3