[Bf-blender-cvs] [b7fbe6ae5de] blender2.8: Initialize scene layer for evaluation context used by preview renderer

Sergey Sharybin noreply at git.blender.org
Mon Jul 24 15:06:25 CEST 2017


Commit: b7fbe6ae5ded2c73a52d298bee60cd70e971d547
Author: Sergey Sharybin
Date:   Mon Jul 24 15:00:44 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBb7fbe6ae5ded2c73a52d298bee60cd70e971d547

Initialize scene layer for evaluation context used by preview renderer

Ideally need to clean and sane and impossible-to-break way of making sure
evaluation context is fully initialized, but that would need some thoughts
and experimentation.

===================================================================

M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 4b7145bcb99..c13583139ae 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3820,6 +3820,7 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
 	re->scene_color_manage = BKE_scene_check_color_management_enabled(sce);
 	re->lay = sce->lay;
 	re->depsgraph = BKE_scene_get_depsgraph(sce, scene_layer);
+	re->eval_ctx->scene_layer = scene_layer;
 
 	camera = RE_GetCamera(re);
 	RE_SetCamera(re, camera);




More information about the Bf-blender-cvs mailing list