livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up 3-point lighting (so it has 3 points) messed up in a rogue merge 

Also tweak the description of a setting
master
Beq 2018-12-28 17:37:36 +00:00
parent c7c3365942
commit ee8f310d34
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -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>

1
indra/newview/app_settings/shaders/class1/objects/previewV.glsl
View File

@ -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;
}