From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 19 Oct 2011 07:33:08 +0000 (+0000)
Subject: fix a compile error in recent bloom changes
X-Git-Tag: xonotic-v0.6.0~163^2~112
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e85279d2ec63bc45263ed22105e20774a731182;p=xonotic%2Fdarkplaces.git

fix a compile error in recent bloom changes

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

diff --git a/gl_rmain.c b/gl_rmain.c
index cd76993a..f5489cfa 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -6545,7 +6545,7 @@ static void R_BlendView(int fbo, rtexture_t *depthtexture, rtexture_t *colortext
 			R_Mesh_PrepareVertices_Mesh_Arrays(4, r_d3dscreenvertex3f, NULL, NULL, NULL, NULL, r_fb.screentexcoord2f, r_fb.bloomtexcoord2f);
 			R_SetupShader_SetPermutationHLSL(SHADERMODE_POSTPROCESS, permutation);
 			R_Mesh_TexBind(GL20TU_FIRST     , r_fb.colortexture);
-			R_Mesh_TexBind(GL20TU_SECOND    , r_fb.bloomtexture);
+			R_Mesh_TexBind(GL20TU_SECOND    , r_fb.bloomtexture[r_fb.bloomindex]);
 			R_Mesh_TexBind(GL20TU_GAMMARAMPS, r_texture_gammaramps       );
 			hlslPSSetParameter4f(D3DPSREGISTER_ViewTintColor        , r_refdef.viewblend[0], r_refdef.viewblend[1], r_refdef.viewblend[2], r_refdef.viewblend[3]);
 			hlslPSSetParameter2f(D3DPSREGISTER_PixelSize            , 1.0/r_fb.screentexturewidth, 1.0/r_fb.screentextureheight);