diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-06-03 17:26:46 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-06-03 17:26:46 +0000 |
| commit | 096b892804a18c8efe7fae8a9005fa7ee56cf65d (patch) | |
| tree | 12eba7025116e81808ec04c94c63a824b5dd3145 | |
| parent | c137cf05560aecaa0a5ce8b6d5995ff83efd3bb8 (diff) | |
| parent | 9d73d103bc137a9de5ccf550b9ceaf61c419179a (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #413)
SL-11238, SL-11337
3 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1138410a07..500cb280fa 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12361,7 +12361,7 @@ <key>Comment</key> <string>If TRUE, ambient light has no effect</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> @@ -12372,7 +12372,7 @@ <key>Comment</key> <string>If TRUE, sunlight has no effect</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> @@ -12383,7 +12383,7 @@ <key>Comment</key> <string>If TRUE, local lights have no effect</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 5b03fbaa50..13e0cb5169 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -111,7 +111,7 @@ void main() vec3 sun_contrib = final_da * sunlit; #if !defined(AMBIENT_KILL) - color.rgb = amblit * 0.5; + color.rgb = pow(amblit, vec3(1.0/1.3)); color.rgb *= ambient; #endif diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 9492141b49..343e5c8ef5 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -120,6 +120,7 @@ void main() #if !defined(AMBIENT_KILL) color.rgb = amblit * 0.5; + color.rgb = pow(color.rgb, vec3(1.0/1.1)); color.rgb *= ambient; #endif |