diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-04-24 10:33:38 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-24 10:33:38 -0700 |
commit | ce48b9d8cf0722f011e12f5bdc09b6e441625813 (patch) | |
tree | 0a66b3f89607bd0a4a0f5065b93b933e5ac5f018 /indra/newview | |
parent | 79318043218a9ec6cb6e52eca936487177554903 (diff) |
Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaV
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index a8efd3e95b..ae3769c786 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -182,7 +182,12 @@ void main() //vec4 color = calcLighting(pos.xyz, norm, diffuse_color, vec4(0.)); vec4 col = vec4(0.0, 0.0, 0.0, diffuse_color.a); - vary_pointlight_col = diffuse_color.rgb; + vec3 diff = pow(diffuse_color.rgb, vec3(2.2)); + + + + vary_pointlight_col = diff; + col.rgb = vec3(0,0,0); |