[Bf-blender-cvs] [15a0ad60274] blender2.8: Fix multi layer/multi pass render

[Dalai Felinto]

Commit: 15a0ad602746bd8dd7dde3822d54979e72ca9de2
Author: Dalai Felinto
Date:   Wed Nov 22 10:33:26 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB15a0ad602746bd8dd7dde3822d54979e72ca9de2

Fix multi layer/multi pass render

But introduced on the SceneRenderLayer > RenderLayer commit:
3a95bdfc65d883e7db006f

Reported by Sergey Sharybin (over irc).

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

M	source/blender/editors/render/render_internal.c

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

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 701227091b3..8119e88eeaa 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -308,9 +308,6 @@ static int screen_render_exec(bContext *C, wmOperator *op)
 
 	/* custom scene and single layer re-render */
 	screen_render_scene_layer_set(op, mainp, &scene, &scene_layer);
-	if (scene_layer == NULL) {
-		scene_layer = CTX_data_scene_layer(C);
-	}
 
 	if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {
 		BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected");
@@ -914,9 +911,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	
 	/* custom scene and single layer re-render */
 	screen_render_scene_layer_set(op, mainp, &scene, &scene_layer);
-	if (scene_layer == NULL) {
-		scene_layer = CTX_data_scene_layer(C);
-	}
 
 	if (RNA_struct_property_is_set(op->ptr, "layer"))
 		jobflag |= WM_JOB_SUSPEND;