From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 28 May 2006 07:27:18 +0000 (+0000)
Subject: added a few more GLSL shader program setting calls in R_RenderScene just to prevent... 
X-Git-Tag: xonotic-v0.1.0preview~3971
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c27615eed1aee3d76a96e2df1f4a0ab4e8c9c7a;p=xonotic%2Fdarkplaces.git

added a few more GLSL shader program setting calls in R_RenderScene just to prevent problems if a model/map rendering call leaves a GLSL program active


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6399 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 594d871e..82a25ff2 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -1790,12 +1790,25 @@ void R_RenderScene(void)
 			R_TimeReport("explosions");
 	}
 
+	if (gl_support_fragment_shader)
+	{
+		qglUseProgramObjectARB(0);CHECKGLERROR
+	}
 	VM_AddPolygonsToMeshQueue();
 
+	if (gl_support_fragment_shader)
+	{
+		qglUseProgramObjectARB(0);CHECKGLERROR
+	}
 	R_MeshQueue_RenderTransparent();
 	if (r_timereport_active)
 		R_TimeReport("drawtrans");
 
+	if (gl_support_fragment_shader)
+	{
+		qglUseProgramObjectARB(0);CHECKGLERROR
+	}
+
 	if (cl.csqc_vidvars.drawworld)
 	{
 		R_DrawCoronas();