[Bf-blender-cvs] [03cfc2b] master: Amend T47425 fix, use scene setting

[Campbell Barton]

Commit: 03cfc2bf6af7567fa78ff03e0a36cbe32a9df647
Author: Campbell Barton
Date:   Tue Feb 16 22:29:54 2016 +1100
Branches: master
https://developer.blender.org/rB03cfc2bf6af7567fa78ff03e0a36cbe32a9df647

Amend T47425 fix, use scene setting

There are times when the preview background is important.

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

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

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 6342c7f..970825e 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3236,6 +3236,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
 		char err_out[256] = "unknown";
 		int width = (scene->r.xsch * scene->r.size) / 100;
 		int height = (scene->r.ysch * scene->r.size) / 100;
+		const bool use_background = (scene->r.alphamode == R_ADDSKY);
 		const char *viewname = BKE_scene_multiview_render_view_name_get(&scene->r, context->view_id);
 
 		/* for old scene this can be uninitialized,
@@ -3250,7 +3251,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
 		        scene, camera, width, height, IB_rect,
 		        context->scene->r.seq_prev_type,
 		        (context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0,
-		        use_gpencil, false, scene->r.alphamode,
+		        use_gpencil, use_background, scene->r.alphamode,
 		        context->gpu_samples, context->gpu_full_samples, viewname,
 		        context->gpu_fx, context->gpu_offscreen, err_out);
 		if (ibuf == NULL) {