Merge branch 'main' into marchcat/c-merge

# Conflicts:
#	indra/newview/llviewermenufile.cpp

1 files changed, 1 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
index 5561a3d488..99cb23839a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
@@ -37,7 +37,6 @@ uniform sampler2D specularMap;
 in vec2 vary_texcoord0;
 
 vec3 linear_to_srgb(vec3 c);
-vec2 encode_normal (vec3 n);
 
 void main()
 {
@@ -53,6 +52,6 @@ void main()
 
     frag_data[0] = vec4(col.rgb, 0.0);
     frag_data[1] = spec;
-    frag_data[2] = vec4(encode_normal(norm.xyz),0,GBUFFER_FLAG_HAS_ATMOS);
+    frag_data[2] = vec4(norm.xyz, GBUFFER_FLAG_HAS_ATMOS);
     frag_data[3] = vec4(0);
 }