[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29217] branches/render25/source/blender/ editors/space_view3d/view3d_draw.c: Render Branch: svn merge https://svn. blender.org/svnroot/bf-blender/trunk/blender -r29214:29216

[Campbell Barton]

Revision: 29217
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29217
Author:   campbellbarton
Date:     2010-06-04 14:25:41 +0200 (Fri, 04 Jun 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender  -r29214:29216

Modified Paths:
--------------
    branches/render25/source/blender/editors/space_view3d/view3d_draw.c

Modified: branches/render25/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- branches/render25/source/blender/editors/space_view3d/view3d_draw.c	2010-06-04 12:23:38 UTC (rev 29216)
+++ branches/render25/source/blender/editors/space_view3d/view3d_draw.c	2010-06-04 12:25:41 UTC (rev 29217)
@@ -2043,6 +2043,8 @@
 	glPopMatrix();
 
 	glColor4ub(255, 255, 255, 255); // XXX, without this the sequencer flickers with opengl draw enabled, need to find out why - campbell
+
+	G.f &= ~G_RENDER_OGL;
 }
 
 /* utility func for ED_view3d_draw_offscreen */