[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53709] trunk/blender/source/blender/ editors/space_sequencer/sequencer_draw.c: Fix #33822: Compositor gets stuck if a sequencer window is also visible

[Sergey Sharybin]

Revision: 53709
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53709
Author:   nazgul
Date:     2013-01-10 16:11:12 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Fix #33822: Compositor gets stuck if a sequencer window is also visible

Issue was caused by a fix for rendered sequencer preview mode, which
will likely conflict with compositor job. Made it so compositor job
will be killed when sequencer uses rendered preview.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-01-10 15:22:19 UTC (rev 53708)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2013-01-10 16:11:12 UTC (rev 53709)
@@ -924,7 +924,7 @@
 	void *cache_handle = NULL;
 	const int is_imbuf = ED_space_sequencer_check_show_imbuf(sseq);
 
-	if (G.is_rendering == FALSE) {
+	if (G.is_rendering == FALSE && (scene->r.seq_flag & R_SEQ_GL_PREV) == 0) {
 		/* stop all running jobs, except screen one. currently previews frustrate Render
 		 * needed to make so sequencer's rendering doesn't conflict with compositor
 		 */