summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-08 20:00:38 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-08 20:00:38 -0700
commitae0f362f220c54e72700b96545b9f4956ee8a113 (patch)
treee6b57a45cf0798ce660073ad1017fed23652c553
parent5aaab576ba42d35449ec8696d79aeb85d6d8015c (diff)
Rollback NORSPEC-156 change which fails to compile due to implicit cast
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl3
1 files changed, 2 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 cb050c800f..8d76485886 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -42,7 +42,8 @@ void main()
{
float shadow = 1.0;
- vec4 color = diffuseLookup(vary_texcoord0.xy) * pow(vertex_color.rgb,vec3(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);