diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-11 08:08:26 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-11 08:08:26 +0800 |
| commit | 4b5794791650a0faf3cb5a1f3f27d9abe63a73fa (patch) | |
| tree | 03e75bd65f2126ceab79ace3c6622d6f6d961929 /indra/newview/app_settings | |
| parent | b8dded3614bbc8326d420c4e660f58e683f2ac4d (diff) | |
| parent | ae9174ffdf340ef12c80547d90d05919957ab512 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 66813e8a67..4739728bee 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9251,7 +9251,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>RenderSkyAutoAdjustAmbientScale</key> <map> diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index e3290e5e3c..d6569cda33 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -308,6 +308,7 @@ void main() final_scale = 1; #endif - frag_color = max(color * final_scale, vec4(0)); + color.rgb *= final_scale; + frag_color = max(color, vec4(0)); } |