From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 22 Feb 2006 12:12:24 +0000 (+0000)
Subject: fix decal draw order bug introduced in recent commit, I forgot that decals are not... 
X-Git-Tag: xonotic-v0.1.0preview~4308
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b1647c8f151dcdb36d6a35de504bce542818239;p=xonotic%2Fdarkplaces.git

fix decal draw order bug introduced in recent commit, I forgot that decals are not queued as transparencies like other particles, so calling R_DrawParticles before rtlights was a bad idea (as it made the rtlights be unaffected by decals)


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

diff --git a/gl_rmain.c b/gl_rmain.c
index fa49f791..fa278314 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -1232,15 +1232,6 @@ void R_RenderScene(void)
 				r_refdef.worldmodel->Draw(r_refdef.worldentity);
 				R_TimeReport("world");
 			}
-
-			R_DrawLightningBeams();
-			R_TimeReport("lightning");
-
-			R_DrawParticles();
-			R_TimeReport("particles");
-
-			R_DrawExplosions();
-			R_TimeReport("explosions");
 		}
 
 		// don't let sound skip if going slow
@@ -1266,6 +1257,18 @@ void R_RenderScene(void)
 
 		GL_ShowTrisColor(0.1, 0, 0, 1);
 
+		if (cl.csqc_vidvars.drawworld)
+		{
+			R_DrawLightningBeams();
+			R_TimeReport("lightning");
+
+			R_DrawParticles();
+			R_TimeReport("particles");
+
+			R_DrawExplosions();
+			R_TimeReport("explosions");
+		}
+
 		R_MeshQueue_RenderTransparent();
 		R_TimeReport("drawtrans");