From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 1 Mar 2008 04:54:54 +0000 (+0000)
Subject: fix two-layer quake sky in r_glsl 1 mode (was blending the alpha layer wrongly)
X-Git-Tag: xonotic-v0.1.0preview~2359
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=43bacdaa6eef3b4e569b787aa327533e694368bd;p=xonotic%2Fdarkplaces.git

fix two-layer quake sky in r_glsl 1 mode (was blending the alpha layer wrongly)


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

diff --git a/gl_rmain.c b/gl_rmain.c
index fae73614..c503245a 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -546,7 +546,7 @@ static const char *builtinshaderstring =
 "	gl_FragColor += tex2;\n"
 "#  endif\n"
 "#  ifdef USEVERTEXTEXTUREBLEND\n"
-"	gl_FragColor = mix(tex2, gl_FragColor, tex2.a);\n"
+"	gl_FragColor = mix(gl_FragColor, tex2, tex2.a);\n"
 "#  endif\n"
 "}\n"
 "# endif\n"