From f0b08518850ff88462d35ac4c24a6481da23cfa6 Mon Sep 17 00:00:00 2001 From: ewasylishen Date: Sat, 16 May 2015 20:55:56 +0000 Subject: [PATCH] r_alias.c: GLSL: fix for fullbright pixels on alias models not respecting alpha. e.g. fixes light_flame_small_yellow entity (progs/flame2.mdl) with alpha 0.5 showing up as solid (most of the pixels on flame2.mdl are fullbright) git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1207 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/r_alias.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quakespasm/Quake/r_alias.c b/quakespasm/Quake/r_alias.c index ea7a8c1e..f573c471 100644 --- a/quakespasm/Quake/r_alias.c +++ b/quakespasm/Quake/r_alias.c @@ -186,7 +186,8 @@ void GLAlias_CreateShaders (void) " // apply GL_EXP2 fog (from the orange book)\n" " float fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n" " fog = clamp(fog, 0.0, 1.0);\n" - " result = vec4(mix(gl_Fog.color.rgb, result.rgb, fog), result.a);\n" + " result = mix(gl_Fog.color, result, fog);\n" + " result.a = gl_Color.a;\n" " gl_FragColor = result;\n" "}\n";