[Bf-blender-cvs] [3bc50db11da] temp-render-depsgraph: From review, depsgraph should always be valid for render layers

Dalai Felinto noreply at git.blender.org
Wed Feb 21 21:51:51 CET 2018


Commit: 3bc50db11daa707d27dab2bf7fdf797dcbd04317
Author: Dalai Felinto
Date:   Wed Feb 21 10:47:38 2018 -0300
Branches: temp-render-depsgraph
https://developer.blender.org/rB3bc50db11daa707d27dab2bf7fdf797dcbd04317

>From review, depsgraph should always be valid for render layers

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

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

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

diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index af043e83fa2..6ecb2c25e1c 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1502,11 +1502,13 @@ static RenderLayer *duplicate_render_layer(RenderLayer *rl)
 		BLI_addtail(&new_rl->passes, new_rpass);
 	}
 
-	if (rl->eval_ctx.depsgraph != NULL) {
-		Scene *scene = DEG_get_evaluated_scene(rl->eval_ctx.depsgraph);
-		new_rl->depsgraph = DEG_graph_new();
-		DEG_evaluation_context_init_from_view_layer_for_render(&new_rl->eval_ctx, new_rl->depsgraph, scene, new_rl->eval_ctx.view_layer);
-	}
+	Scene *scene = DEG_get_evaluated_scene(rl->eval_ctx.depsgraph);
+	new_rl->depsgraph = DEG_graph_new();
+	DEG_evaluation_context_init_from_view_layer_for_render(
+	            &new_rl->eval_ctx,
+	            new_rl->depsgraph,
+	            scene,
+	            new_rl->eval_ctx.view_layer);
 
 	return new_rl;
 }



More information about the Bf-blender-cvs mailing list