diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-13 17:11:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-13 17:11:19 -0400 |
| commit | c7c7726c6f6c76950d47f9f640993bb80c659300 (patch) | |
| tree | cf5654661a81e331e1b4d14c45ee80b7fa83929c /indra/newview/app_settings/shaders/class2/deferred | |
| parent | 753e8673c30f7d5c87e0e6e86c36482f9b103983 (diff) | |
| parent | 8d4c6771fdbea274eabc7a2e2606b3b77952cb4a (diff) | |
merge changes for drtvwr-135
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 61a7f1e32f..a137bea30f 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -309,11 +309,11 @@ void main() // vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); float sa = dot(refnormpersp, sun_dir.xyz); - vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*texture2D(lightFunc, vec2(sa, spec.a)).r; + vec3 dumbshiny = vary_SunlitColor*scol_ambocc.r*(6 * texture2D(lightFunc, vec2(sa, spec.a)).r); // add the two types of shiny together vec3 spec_contrib = dumbshiny * spec.rgb; - bloom = dot(spec_contrib, spec_contrib); + bloom = dot(spec_contrib, spec_contrib) / 4; col += spec_contrib; //add environmentmap |