From ee8f310d34eed3024f8a5440959cf01dee34bf1c Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 28 Dec 2018 17:37:36 +0000
Subject: [PATCH] Fix up 3-point lighting (so it has 3 points) messed up in a
 rogue merge Also tweak the description of a setting

---
 indra/newview/app_settings/settings.xml                         | 2 +-
 indra/newview/app_settings/shaders/class1/objects/previewV.glsl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7613c49e3f..8e54392182 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9029,7 +9029,7 @@
   <key>MeshPreviewBaseColor</key>
   <map>
     <key>Comment</key>
-    <string>Canvas colour for the Mesh uploader</string>
+    <string>Diffuse colour for the Mesh uploader when textures not shown</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl
index 55f6597498..3424613e94 100644
--- a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl
@@ -94,6 +94,7 @@ void main()
 //	col.rgb += light_diffuse[2].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z);
 	col.rgb += light_diffuse[2].rgb * calcDirectionalLight(norm, light_position[2].xyz);
 //	col.rgb += light_diffuse[3].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z);
+	col.rgb += light_diffuse[3].rgb * calcDirectionalLight(norm, light_position[3].xyz);
 	col /= 2.0;
 	vertex_color = col*color;
 }