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/llwlparammanager.cpp
View File

@@ -357,11 +357,10 @@ void LLWLParamManager::propagateParameters(void)
mCurParams.set("lightnorm", mLightDir);
// bind the variables for all shaders only if we're using WindLight
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;
}
// get the cfr version of the sun's direction
@@ -415,11 +414,10 @@ void LLWLParamManager::update(LLViewerCamera * cam)
lightNorm3 *= LLQuaternion(-(camYaw + camYawDelta), LLVector3(0.f, 1.f, 0.f));
mRotatedLightDir = LLVector4(lightNorm3, 0.f);
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;
}
}
}