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

Merged in euclid-11368 (pull request #58) 

SL-11368, fix missing water uniforms for low shader settings

Approved-by: Michael Pohoreski
meow-7.2.2
Dave Houlton 2020-04-03 18:06:51 +00:00
parent eb4ceb533d 0524a1a86f
commit 81c4c76d6d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llenvironment.cpp
View File

@ -1608,11 +1608,8 @@ void LLEnvironment::updateGLVariablesForSettings(LLGLSLShader *shader, const LLS
void LLEnvironment::updateShaderUniforms(LLGLSLShader *shader)
{
if (gPipeline.canUseWindLightShaders())
{
updateGLVariablesForSettings(shader, mCurrentEnvironment->getWater());
updateGLVariablesForSettings(shader, mCurrentEnvironment->getSky());
}
updateGLVariablesForSettings(shader, mCurrentEnvironment->getWater());
updateGLVariablesForSettings(shader, mCurrentEnvironment->getSky());
}
void LLEnvironment::recordEnvironment(S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envinfo, LLSettingsBase::Seconds transition)