Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCC fixup

Browse Source
This commit is contained in:
Shyotl
2011-09-09 14:42:59 -05:00
parent e5448533bf
commit 87bada69fa
5 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llwaterparammanager.cpp
View File

@@ -224,11 +224,10 @@ void LLWaterParamManager::propagateParameters(void)
// bind the variables only if we're using shaders
if(gPipeline.canUseVertexShaders())
{
LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
end_shaders = mShaderList.end();
for(shaders_iter = mShaderList.begin(); shaders_iter != end_shaders; ++shaders_iter)
std::vector<LLGLSLShader*>::iterator shaders_iter=mShaderList.begin();
for(; shaders_iter != mShaderList.end(); ++shaders_iter)
{
shaders_iter->mUniformsDirty = TRUE;
(*shaders_iter)->mUniformsDirty = TRUE;
}
}
@@ -331,11 +330,10 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
sunMoonDir.normVec();
mWaterFogKS = 1.f/llmax(sunMoonDir.mV[2], WATER_FOG_LIGHT_CLAMP);
LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
end_shaders = mShaderList.end();
for(shaders_iter = mShaderList.begin(); shaders_iter != end_shaders; ++shaders_iter)
std::vector<LLGLSLShader*>::iterator shaders_iter=mShaderList.begin();
for(; shaders_iter != mShaderList.end(); ++shaders_iter)
{
shaders_iter->mUniformsDirty = TRUE;
(*shaders_iter)->mUniformsDirty = TRUE;
}
}
}