diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-02 09:56:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-02 09:56:40 -0400 |
| commit | 564121fca4593b6a877ff6622c23a8fd6540c7dc (patch) | |
| tree | b399bb271231f192fa9c9cc093367571ed21dfe8 /indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | |
| parent | e66817e6d7e493bb5c3eccc64bcfb6be2f66f068 (diff) | |
| parent | 5f417f6a431970a971abf601fb9f4b82b731abf6 (diff) | |
merge changes for storm-1823
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 51110ae4df..94669fa5d3 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -299,11 +299,11 @@ void main() // vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); float sa = dot(refnormpersp, sun_dir.xyz); - vec3 dumbshiny = vary_SunlitColor*texture2D(lightFunc, vec2(sa, spec.a)).r; + vec3 dumbshiny = vary_SunlitColor*(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 |