kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix Sequencer OpenGL render ignoring preview channel

Browse Source
This commit is contained in:
Campbell Barton 2014-05-25 23:49:53 +10:00
parent 08528f577d
commit f574b1ca3c
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/render/render_opengl.c
View File

@ -340,20 +340,24 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
return false; return false;
} }
/* 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 */ /* only one render job at a time */
if (WM_jobs_test(wm, scene, WM_JOB_TYPE_RENDER)) if (WM_jobs_test(wm, scene, WM_JOB_TYPE_RENDER))
return false; return false;
if (!is_view_context && scene->camera == NULL) { if (is_sequencer) {
BKE_report(op->reports, RPT_ERROR, "Scene has no camera"); is_view_context = false;
return 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;
}
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)) { if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) {