From 0ee0f952c29e0b8bdcfe332823adbdab86190c71 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Wed, 8 May 2013 20:00:38 -0700 Subject: Rollback NORSPEC-156 change which fails to compile due to implicit cast --- indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl') diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index c5513414dd..ce5584534e 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -42,8 +42,8 @@ void main() { float shadow = 1.0; - vec3 vcolor = pow(vertex_color.rgb, vec3(2.2f,2.2f,2.2f)); - vec4 color = diffuseLookup(vary_texcoord0.xy) * vec4(vcolor.rgb,1.0f); + vec4 color = diffuseLookup(vary_texcoord0.xy) * vertex_color; + color.rgb = pow(color.rgb, vec3(2.2f,2.2f,2.2f)); color.rgb = fullbrightAtmosTransport(color.rgb); -- cgit v1.2.3