Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade

1 files changed, 6 insertions, 5 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
index 87c1ff5517..b5c38bba04 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
@@ -104,15 +104,16 @@ void main()
     tnorm = normalize(tnorm.xyz);
 
     norm.xyz = normalize(tnorm.xyz);
+
     // RGB = Occlusion, Roughness, Metal
-    // default values
-    //   occlusion ?
-    //   roughness 1.0
-    //   metal     1.0
+    // default values, see LLViewerTexture::sDefaultPBRORMImagep
+    //   occlusion 1.0
+    //   roughness 0.0
+    //   metal     0.0
 #ifdef HAS_SPECULAR_MAP
     vec3 spec = texture2D(specularMap, vary_texcoord2.xy).rgb;
 #else
-    vec3 spec = vec3(1,1,1);
+    vec3 spec = vec3(1,0,0);
 #endif
     
     spec.g *= roughnessFactor;