Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenkernel / intern / sequencer.c

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 3a04bd79360508c47356272d39dfd3234fde1ef3..5f58af7e53851939f681e7ec6690ceb0713dcc93 100644 (file)
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -63,9 +63,9 @@
 #include "BLT_translation.h"
 
 #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_sequencer.h"
 #include "BKE_movieclip.h"
@@ -75,6 +75,8 @@
 #include "BKE_library.h"
 #include "BKE_idprop.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "RE_pipeline.h"
@@ -89,7 +91,7 @@
 #include "BKE_sound.h"
 
 #ifdef WITH_AUDASPACE
-#  include AUD_SPECIAL_H
+#  include <AUD_Special.h>
 #endif
 
 /* mutable state for sequencer */
@@ -3303,10 +3305,10 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
                        context->scene->r.seq_prev_type = 3 /* == OB_SOLID */;
 
                /* opengl offscreen render */
-               BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene, scene->lay);
+               BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene);
                ibuf = sequencer_view3d_cb(
                        /* set for OpenGL render (NULL when scrubbing) */
-                       scene, camera, width, height, IB_rect,
+                       context->eval_ctx, scene, BKE_scene_layer_from_scene_get(scene), camera, width, height, IB_rect,
                        context->scene->r.seq_prev_type,
                        (context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0,
                        use_gpencil, use_background, scene->r.alphamode,
@@ -3336,7 +3338,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
                        if (re == NULL)
                                re = RE_NewRender(scene->id.name);
 
-                       BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene, scene->lay);
+                       BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene);
                        RE_BlenderFrame(re, context->bmain, scene, NULL, camera, scene->lay, frame, false);
 
                        /* restore previous state after it was toggled on & off by RE_BlenderFrame */
@@ -3396,7 +3398,7 @@ finally:
        scene->r.subframe = orig_data.subframe;
 
        if (is_frame_update) {
-               BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene, scene->lay);
+               BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene);
        }
 
 #ifdef DURIAN_CAMERA_SWITCH