summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-10 10:34:26 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-10 10:34:26 -0700
commit6074f65991f4a9e928ef9609e90d8e9570350e63 (patch)
tree9d287cd76903efdbf18058102d3f5274691ec585 /indra/newview/app_settings
parent5aa3f3c808976c3b709bd8141d4338e910c49691 (diff)
parentd2f71df15f14fe0f7e17f962d39d19dd571fc530 (diff)
Merge with vwr-dev-mat
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index ce5584534e..975180606a 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;
- vec4 color = diffuseLookup(vary_texcoord0.xy) * vertex_color;
- color.rgb = pow(color.rgb, vec3(2.2f,2.2f,2.2f));
+ 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);