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/blenkernel/intern/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/blenkernel/intern/workspace.c')
-rw-r--r-- | source/blender/blenkernel/intern/workspace.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index fec9d736e09..67639b4c7ab 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -401,13 +401,13 @@ ListBase *BKE_workspace_transform_orientations_get(WorkSpace *workspace) return &workspace->transform_orientations; } -SceneLayer *BKE_workspace_render_layer_get(const WorkSpace *workspace) +ViewLayer *BKE_workspace_view_layer_get(const WorkSpace *workspace) { - return workspace->render_layer; + return workspace->view_layer; } -void BKE_workspace_render_layer_set(WorkSpace *workspace, SceneLayer *layer) +void BKE_workspace_view_layer_set(WorkSpace *workspace, ViewLayer *layer) { - workspace->render_layer = layer; + workspace->view_layer = layer; } ListBase *BKE_workspace_layouts_get(WorkSpace *workspace) @@ -477,9 +477,9 @@ void BKE_workspace_update_tagged(struct EvaluationContext *eval_ctx, WorkSpace *workspace, Scene *scene) { - SceneLayer *scene_layer = BKE_workspace_render_layer_get(workspace); + ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace); struct Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, - scene_layer, + view_layer, true); - BKE_scene_graph_update_tagged(eval_ctx, depsgraph, bmain, scene, scene_layer); + BKE_scene_graph_update_tagged(eval_ctx, depsgraph, bmain, scene, view_layer); } |