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

SH-1427 Fix for sunlight color getting clobbered for non-deferred atmospheric shaders.

meow-7.2.2
Dave Parks 2011-11-01 14:33:20 -05:00
parent 108cdf58c2
commit b58229a64e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llshadermgr.cpp
View File

@ -974,7 +974,7 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms.push_back("cloude_noise_texture");
mReservedUniforms.push_back("fullbright");
mReservedUniforms.push_back("lightnorm");
mReservedUniforms.push_back("sunlight_color");
mReservedUniforms.push_back("sunlight_color_copy");
mReservedUniforms.push_back("ambient");
mReservedUniforms.push_back("blue_horizon");
mReservedUniforms.push_back("blue_density");

4
indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
View File

@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
uniform vec4 sunlight_color;
uniform vec4 sunlight_color_copy;
uniform vec4 light_ambient;
vec3 atmosAmbient(vec3 light)
@ -33,7 +33,7 @@ vec3 atmosAmbient(vec3 light)
vec3 atmosAffectDirectionalLight(float lightIntensity)
{
return sunlight_color.rgb * lightIntensity;
return sunlight_color_copy.rgb * lightIntensity;
}
vec3 atmosGetDiffuseSunlightColor()