[Bf-blender-cvs] [f574b1c] master: Fix Sequencer OpenGL render ignoring preview channel

[Campbell Barton]

Commit: f574b1ca3cda82b2cffa992bd4288c44e99cc643
Author: Campbell Barton
Date:   Sun May 25 23:49:53 2014 +1000
https://developer.blender.org/rBf574b1ca3cda82b2cffa992bd4288c44e99cc643

Fix Sequencer OpenGL render ignoring preview channel

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

M	source/blender/editors/render/render_opengl.c

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

diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index c1f8dd8..94dbf2e 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)) {