From 6b739bc2dcd5f4c6a84c72508608a63cfcc89dca Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 25 Oct 2017 11:02:52 -0200 Subject: Fix T53156: VSE not working since Workspace > engine change This would break if using preview in VSE. We now use the scene engine not the workspace engine. That said we could have the preview engine defined as part of the sequence strip as we had for draw modes in the past. But this is a separated topic for a separated patch. This issue in particular was introduced in e4f2b2be26ad. Note: VSE preview is still broken in two cases: * If you have Eevee as the engine in the Scene of the Scene strip. * If you use Clay, save the file, and re-open. --- source/blender/blenkernel/intern/sequencer.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/blenkernel/intern/sequencer.c') diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index c6b6f97b0bc..53b32bd7df8 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -90,6 +90,8 @@ #include "BKE_context.h" #include "BKE_sound.h" +#include "RE_engine.h" + #ifdef WITH_AUDASPACE # include #endif @@ -3308,6 +3310,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq context->scene->r.seq_prev_type = 3 /* == OB_SOLID */; /* opengl offscreen render */ + context->eval_ctx->engine = RE_engines_find(scene->view_render.engine_id); BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene); ibuf = sequencer_view3d_cb( /* set for OpenGL render (NULL when scrubbing) */ -- cgit v1.2.3