diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-09 16:01:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-09 16:01:07 -0400 |
| commit | 0229b65a4d40287454bd690a414b6ce8f63856ea (patch) | |
| tree | 6eabd292b4b1a5374848fadaff21972ebb597c52 /indra/newview/app_settings/shaders | |
| parent | 8fe17529c672602845cf06cc15d4e776f0b6114a (diff) | |
| parent | 356d738250a872663692876796c043cd04f87d44 (diff) | |
merge changes for fix from geenz
Diffstat (limited to 'indra/newview/app_settings/shaders')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 |
2 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 5f88cca30b..63c819f941 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -318,7 +318,7 @@ void main() // add the two types of shiny together vec3 spec_contrib = dumbshiny * spec.rgb; - bloom = dot(spec_contrib, spec_contrib) / 4; + bloom = dot(spec_contrib, spec_contrib) / 6; col += spec_contrib; //add environmentmap diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index de9b2cd0d1..8e638c64eb 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -325,7 +325,7 @@ void main() // add the two types of shiny together vec3 spec_contrib = dumbshiny * spec.rgb; - bloom = dot(spec_contrib, spec_contrib) / 4; + bloom = dot(spec_contrib, spec_contrib) / 6; col += spec_contrib; //add environmentmap |