summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-07-16 10:25:06 -0700
committerGraham Linden <graham@lindenlab.com>2013-07-16 10:25:06 -0700
commitf618b7d5cc84a83739a8ac6c3eea7d0a7d4f22cd (patch)
treeeac7ff9939260b336e06aeba19a79d5b008e025b /indra/newview/app_settings
parentf0f30c976bba99842cf0451621e14c690ef3ceae (diff)
NORSPEC-293 WIP fix fullbrightF order of ops to match non-deferred with fullbright+glow+texcolor
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index ec25f52ef5..33c07a6e08 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -69,8 +69,8 @@ void main()
vec4 color = texture2D(diffuseMap, vary_texcoord0.xy);
#endif
- color.rgb = srgb_to_linear(color.rgb);
color.rgb *= vertex_color.rgb;
+ color.rgb = srgb_to_linear(color.rgb);
color.rgb = fullbrightAtmosTransport(color.rgb);
color.rgb = fullbrightScaleSoftClip(color.rgb);