diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-08 20:00:38 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-08 20:00:38 -0700 |
commit | 0ee0f952c29e0b8bdcfe332823adbdab86190c71 (patch) | |
tree | 74fd6243df2f9ee61584f4d6571a50a0d8d76d01 /indra/newview/app_settings/shaders/class1/deferred | |
parent | 1e8263772c7d1097e1b373ac4f4b6f13e62ac60f (diff) |
Rollback NORSPEC-156 change which fails to compile due to implicit cast
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 4 |
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 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); |