diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-13 22:08:06 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-13 22:08:06 +0100 |
| commit | 2f9d08f48d879b1f8929cff513fe07359e80043d (patch) | |
| tree | 19a6265c982594cfb5e1985d673f158a9db60aac /indra | |
| parent | a21fa8664b596a6d3dd08d6d9a52bb41515bd159 (diff) | |
Spruce up the non-ALM stars too.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl | 6 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl b/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl index a96d04cc39..f6b31a5956 100644 --- a/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl @@ -38,7 +38,9 @@ VARYING vec2 vary_texcoord0; void main() { - vec4 color = vertex_color*texture2D(diffuseMap, vary_texcoord0.xy); - color.a *= custom_alpha; + vec4 color = texture2D(diffuseMap, vary_texcoord0.xy); + color.rgb = pow(color.rgb, vec3(0.45)); + color.rgb *= vertex_color.rgb; + color.a *= max(custom_alpha, vertex_color.a); frag_color = color; } diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 231fec46a9..c6267d50ff 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -56,8 +56,6 @@ #include "lltrace.h" #include "llfasttimer.h" -#pragma optimize("", off) - #undef min #undef max |