[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28670] trunk/blender: Sequencer crashes with clips that have OpenGl render enabled (rev 28658)

[Campbell Barton]

Revision: 28670
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28670
Author:   campbellbarton
Date:     2010-05-08 21:08:33 +0200 (Sat, 08 May 2010)

Log Message:
-----------
Sequencer crashes with clips that have OpenGl render enabled (rev 28658)

 disabling for now, opengl write rendering isnt drivial to solve.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28658

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2010-05-08 17:54:29 UTC (rev 28669)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2010-05-08 19:08:33 UTC (rev 28670)
@@ -382,11 +382,13 @@
         col.active = render.use_sequencer_gl_preview
         col.prop(render, "sequencer_gl_preview", text="")
 
+        '''
         col = layout.column()
         col.prop(render, "use_sequencer_gl_render", text="Open GL Render")
         col = layout.column()
         col.active = render.use_sequencer_gl_render
         col.prop(render, "sequencer_gl_render", text="")
+        '''
 
 
 class SEQUENCER_PT_effect(SequencerButtonsPanel):

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-05-08 17:54:29 UTC (rev 28669)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-05-08 19:08:33 UTC (rev 28670)
@@ -2178,7 +2178,7 @@
 
 			int rendering = G.rendering;
 			int doseq;
-			int doseq_gl= G.rendering ? (scene->r.seq_flag & R_SEQ_GL_REND) : (scene->r.seq_flag & R_SEQ_GL_PREV);
+			int doseq_gl= G.rendering ? /*(scene->r.seq_flag & R_SEQ_GL_REND)*/ 0 : (scene->r.seq_flag & R_SEQ_GL_PREV);
 
 			/* prevent eternal loop */
 			doseq= scene->r.scemode & R_DOSEQ;