summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-02 14:50:24 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-02 14:50:24 +0100
commitcf3c8e6af85a06fe40eb8d37129945573029d178 (patch)
tree9124aa1f34d3ed3f2a9b6be66122543902c7ffe0 /indra/newview
parent17f709abcde85fd073bd0ef8b1525cf4a021ccb7 (diff)
ssreflections: use the minimum of the lighting dp and the appropriateness. not the product.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 51d737f10b..8b2b983ba4 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -317,6 +317,8 @@ void main()
float reflit = max(dot(refn, reflight.xyz), 0.0);
// apply sun color to guess-point, dampen according to inappropriateness of guess
vec3 refprod = (vary_SunlitColor*reflit) * refcol.rgb * refapprop;
+ float refmod = min(refapprop, reflit);
+ vec3 refprod = vary_SunlitColor * refcol.rgb * refmod;
vec3 ssshiny = (refprod * spec.a);
// add the two types of shiny together