[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30591] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: Fix #22841: crash rendering scene with opengl in sequencer as part of

[Brecht Van Lommel]

Revision: 30591
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30591
Author:   blendix
Date:     2010-07-21 18:20:54 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
Fix #22841: crash rendering scene with opengl in sequencer as part of
animation. Only allow this from main thread, opengl can't be called from
render threads. It was already disabled in background mode.

For now I'm going to consider this a limitation.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-21 16:18:00 UTC (rev 30590)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-21 16:20:54 UTC (rev 30591)
@@ -2258,7 +2258,7 @@
 			seq->scene->markers.first= seq->scene->markers.last= NULL;
 #endif
 
-			if(sequencer_view3d_cb && doseq_gl && (seq->scene == scene || have_seq==0) && seq->scene->camera) {
+			if(sequencer_view3d_cb && BLI_thread_is_main() && doseq_gl && (seq->scene == scene || have_seq==0) && seq->scene->camera) {
 				/* opengl offscreen render */
 				scene_update_for_newframe(seq->scene, seq->scene->lay);
 				se->ibuf= sequencer_view3d_cb(seq->scene, seqrectx, seqrecty, scene->r.seq_prev_type);