diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:52:39 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 12:48:23 +0300 |
commit | 3abe8b3292cf7a50a9200b95401993384df24d9a (patch) | |
tree | 6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/makesrna/intern/rna_workspace.c | |
parent | fb7d23bdb2a5c0ed00067045e4acdf6593258b52 (diff) |
Rename any instance of scene layer or render layer in code with view layer
The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.
* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started
Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.
Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.
Reviewers: campbellbarton, sergey
Differential Revision: https://developer.blender.org/D2927
Diffstat (limited to 'source/blender/makesrna/intern/rna_workspace.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_workspace.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c index 354e400a392..7e7b2eeccd7 100644 --- a/source/blender/makesrna/intern/rna_workspace.c +++ b/source/blender/makesrna/intern/rna_workspace.c @@ -95,28 +95,28 @@ static PointerRNA rna_workspace_transform_orientations_item_get(CollectionProper return rna_pointer_inherit_refine(&iter->parent, &RNA_TransformOrientation, transform_orientation); } -static PointerRNA rna_workspace_render_layer_get(PointerRNA *ptr) +static PointerRNA rna_workspace_view_layer_get(PointerRNA *ptr) { WorkSpace *workspace = ptr->data; - SceneLayer *render_layer = BKE_workspace_render_layer_get(workspace); + ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace); /* XXX hmrf... lookup in getter... but how could we avoid it? */ for (Scene *scene = G.main->scene.first; scene; scene = scene->id.next) { - if (BLI_findindex(&scene->render_layers, render_layer) != -1) { + if (BLI_findindex(&scene->view_layers, view_layer) != -1) { PointerRNA scene_ptr; RNA_id_pointer_create(&scene->id, &scene_ptr); - return rna_pointer_inherit_refine(&scene_ptr, &RNA_SceneLayer, render_layer); + return rna_pointer_inherit_refine(&scene_ptr, &RNA_ViewLayer, view_layer); } } return PointerRNA_NULL; } -static void rna_workspace_render_layer_set(PointerRNA *ptr, PointerRNA value) +static void rna_workspace_view_layer_set(PointerRNA *ptr, PointerRNA value) { WorkSpace *workspace = ptr->data; - BKE_workspace_render_layer_set(workspace, value.data); + BKE_workspace_view_layer_set(workspace, value.data); } #else /* RNA_RUNTIME */ @@ -168,11 +168,11 @@ static void rna_def_workspace(BlenderRNA *brna) "rna_workspace_transform_orientations_item_get", NULL, NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Transform Orientations", ""); - prop = RNA_def_property(srna, "render_layer", PROP_POINTER, PROP_NONE); - RNA_def_property_struct_type(prop, "SceneLayer"); - RNA_def_property_pointer_funcs(prop, "rna_workspace_render_layer_get", "rna_workspace_render_layer_set", + prop = RNA_def_property(srna, "view_layer", PROP_POINTER, PROP_NONE); + RNA_def_property_struct_type(prop, "ViewLayer"); + RNA_def_property_pointer_funcs(prop, "rna_workspace_view_layer_get", "rna_workspace_view_layer_set", NULL, NULL); - RNA_def_property_ui_text(prop, "Active Render Layer", "The active render layer used in this workspace"); + RNA_def_property_ui_text(prop, "Active View Layer", "The active view layer used in this workspace"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL); RNA_def_property_update(prop, NC_SCREEN | ND_LAYER, NULL); |