From 774d91b20bcc1ac57ab29d58fc492ec369d1fc44 Mon Sep 17 00:00:00 2001 From: Graham Linden <graham@lindenlab.com> Date: Thu, 27 Jun 2019 09:46:15 -0700 Subject: SL-11503 Make underwater terrain shader mult vert lighting. --- .../app_settings/shaders/class1/environment/terrainWaterF.glsl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl index 937f38842f..bbfec3b532 100644 --- a/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl @@ -55,8 +55,10 @@ void main() float alpha2 = texture2D(alpha_ramp,vary_texcoord1.xy).a; float alphaFinal = texture2D(alpha_ramp, vary_texcoord1.zw).a; vec4 outColor = mix( mix(color3, color2, alpha2), mix(color1, color0, alpha1), alphaFinal ); - + + outColor.rgb *= vertex_color.rgb; outColor = applyWaterFog(outColor); + frag_color = outColor; } -- cgit v1.2.3