[Bf-blender-cvs] [dd89bcc832a] master: Fix T65614: Sequencer render single layer only

[Sergey Sharybin]

Commit: dd89bcc832a091b245828092eccbcc36f40b7d52
Author: Sergey Sharybin
Date:   Wed Jun 19 16:00:38 2019 +0200
Branches: master
https://developer.blender.org/rBdd89bcc832a091b245828092eccbcc36f40b7d52

Fix T65614: Sequencer render single layer only

Was noticeable when sequencer uses scene with a compositor.

The way it was using render API was forcing a single render layer.

Reviewers: brecht

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D5095

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

M	source/blender/blenkernel/intern/sequencer.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 2514bad5709..971ca77ff3d 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3578,7 +3578,8 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context,
         re = RE_NewSceneRender(scene);
       }
 
-      RE_RenderFrame(re, context->bmain, scene, view_layer, camera, frame, false);
+      RE_RenderFrame(
+          re, context->bmain, scene, have_comp ? NULL : view_layer, camera, frame, false);
 
       /* restore previous state after it was toggled on & off by RE_RenderFrame */
       G.is_rendering = is_rendering;