diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-25 17:49:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-25 17:52:10 +0400 |
| commit | f574b1ca3cda82b2cffa992bd4288c44e99cc643 (patch) | |
| tree | cd34465fdebd1eaf007459d349365370031391e4 /source/blender/editors/render/render_opengl.c | |
| parent | 08528f577dcb47f570413ce600137f3729a35d94 (diff) | |
Fix Sequencer OpenGL render ignoring preview channel
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index c1f8dd89f71..94dbf2eed8c 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -340,20 +340,24 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) return false; } - /* ensure we have a 3d view */ + /* only one render job at a time */ + if (WM_jobs_test(wm, scene, WM_JOB_TYPE_RENDER)) + return false; - if (!ED_view3d_context_activate(C)) { - RNA_boolean_set(op->ptr, "view_context", false); + if (is_sequencer) { is_view_context = false; } + else { + /* ensure we have a 3d view */ + if (!ED_view3d_context_activate(C)) { + RNA_boolean_set(op->ptr, "view_context", false); + is_view_context = false; + } - /* only one render job at a time */ - if (WM_jobs_test(wm, scene, WM_JOB_TYPE_RENDER)) - return false; - - if (!is_view_context && scene->camera == NULL) { - BKE_report(op->reports, RPT_ERROR, "Scene has no camera"); - return false; + if (!is_view_context && scene->camera == NULL) { + BKE_report(op->reports, RPT_ERROR, "Scene has no camera"); + return false; + } } if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) { |