[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22649] branches/blender2.5/blender/source /blender/editors/space_view3d/drawvolume.c: Smoke:

[Daniel Genrich]

Revision: 22649
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22649
Author:   genscher
Date:     2009-08-20 10:59:09 +0200 (Thu, 20 Aug 2009)

Log Message:
-----------
Smoke:
* Fix OpenGL drawing resulting (at least on windows) in missing panels when switching fullscreen + back

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c	2009-08-20 08:18:54 UTC (rev 22648)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c	2009-08-20 08:59:09 UTC (rev 22649)
@@ -203,17 +203,14 @@
 	float *points = NULL;
 	int numpoints = 0;
 	float cor[3] = {1.,1.,1.};
+	int gl_depth = 0, gl_blend = 0;
 
-	/*
-	res[0] = smd->domain->res[0];
-	res[1] = smd->domain->res[1];
-	res[2] = smd->domain->res[2];
-	*/
+	glGetBooleanv(GL_BLEND, (GLboolean *)&gl_blend);
+	glGetBooleanv(GL_DEPTH_TEST, (GLboolean *)&gl_depth);
 
 	wmLoadMatrix(rv3d->viewmat);
 
 	glDepthMask(GL_FALSE);
-	glEnable(GL_TEXTURE_3D);
 	glDisable(GL_DEPTH_TEST);
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -296,9 +293,12 @@
 
 	wmMultMatrix(ob->obmat);	
 
-	glDisable(GL_TEXTURE_3D);
-	glDisable(GL_BLEND);
-	glEnable(GL_DEPTH_TEST);
-	glDepthMask(GL_TRUE);	
+	if(gl_blend)
+		glDisable(GL_BLEND);
+	if(gl_depth)
+	{
+		glEnable(GL_DEPTH_TEST);
+		glDepthMask(GL_TRUE);	
+	}
 }