diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-01-18 19:11:28 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-01-18 19:17:07 +0300 |
commit | 74f872df3a0d45cba58540f240101ce4724f11d0 (patch) | |
tree | 07bbe27807dff29722de0661dbed1474f33ae513 /source/blender/editors | |
parent | 33ddd926b769fca68bc485312ca9def847847b87 (diff) |
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".
Diffstat (limited to 'source/blender/editors')
5 files changed, 9 insertions, 9 deletions
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); } } |