fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of D:\Git_New\fgdata

Browse source
This commit is contained in:
Vivian Meazza 2012-08-19 21:55:51 +01:00
commit b3922c08c1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Shaders/ubershader-gbuffer.frag
View file

@ -154,8 +154,8 @@ void main (void)
ambient_Correction = clamp(ambient_Correction, -1.0, 1.0);
color.a = texel.a * alpha;
//vec4 fragColor = vec4(color.rgb * mixedcolor.rgb + ambient_Correction.rgb, color.a);
vec4 fragColor = vec4(color.rgb * mixedcolor, color.a);
vec4 fragColor = vec4(color.rgb * mixedcolor.rgb + ambient_Correction.rgb, color.a);
//vec4 fragColor = vec4(color.rgb * mixedcolor, color.a);
//////////////////////////////////////////////////////////////////////
// BEGIN lightmap