Merge pull request #1626 from...

Merge pull request #1626 from secondlife/1614-pbr-materials-exhibit-striationmoiré-patterns-in-specular-highlights

1614 pbr materials exhibit striationmoiré patterns in specular highlights

indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl

@@ -142,18 +142,9 @@ vec2 getScreenCoordinate(vec2 screenpos)
 }
 
 vec4 getNorm(vec2 screenpos)
-{
-    return texture(normalMap, screenpos.xy);
-}
-
-// return packedNormalEnvIntensityFlags since GBUFFER_FLAG_HAS_PBR needs .w
-// See: C++: addDeferredAttachments(), GLSL: softenLightF
-vec4 getNormalEnvIntensityFlags(vec2 screenpos, out vec3 n, out float envIntensity)
 {
     vec4 norm = texture(normalMap, screenpos.xy);
-    n = norm.xyz;
-    envIntensity = texture(emissiveRect, screenpos.xy).r;
-
+    norm.xyz = normalize(norm.xyz);
     return norm;
 }