Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-11-22 15:52:39 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-23 12:48:23 +0300
commit3abe8b3292cf7a50a9200b95401993384df24d9a (patch)
tree6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/depsgraph/intern/depsgraph_eval.cc
parentfb7d23bdb2a5c0ed00067045e4acdf6593258b52 (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/depsgraph/intern/depsgraph_eval.cc')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_eval.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 00b07307933..31332b416d5 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -80,13 +80,13 @@ void DEG_evaluation_context_init(EvaluationContext *eval_ctx,
void DEG_evaluation_context_init_from_scene(EvaluationContext *eval_ctx,
Scene *scene,
- SceneLayer *scene_layer,
+ ViewLayer *view_layer,
RenderEngineType *engine,
eEvaluationMode mode)
{
DEG_evaluation_context_init(eval_ctx, mode);
- eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, false);
- eval_ctx->scene_layer = scene_layer;
+ eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false);
+ eval_ctx->view_layer = view_layer;
eval_ctx->engine = engine;
eval_ctx->ctime = BKE_scene_frame_get(scene);
BLI_assert(eval_ctx->depsgraph != NULL);