diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 22:27:29 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 22:27:29 +0000 |
| commit | c137cf05560aecaa0a5ce8b6d5995ff83efd3bb8 (patch) | |
| tree | 411e771d28893542837a06ff2cd4152f4a9344bf | |
| parent | 57116089d07332247b2fe76ae8b17888df350110 (diff) | |
| parent | ee9ad6520ec0cad689a9dfa7ca55717a43f2e897 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #412)
SL-11343
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index 8e0b903d04..1e7ca08aa1 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -243,6 +243,7 @@ void main() #endif diffuse_linear.rgb *= vertex_color.rgb; + diffuse_srgb.rgb *= linear_to_srgb(vertex_color.rgb); #ifdef HAS_SPECULAR_MAP vec4 spec = texture2D(specularMap, vary_texcoord2.xy); |