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

Code Clean up

Browse Source
This commit is contained in:
Lirusaito
2019-03-08 13:51:14 -05:00
parent 26a7de79c7
commit 28e464f368
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llrender/llpostprocess.cpp
View File

@@ -375,19 +375,16 @@ LLPostProcess::LLPostProcess(void) :
LLSD& defaults = mAllEffectInfo["Default"]; LLSD& defaults = mAllEffectInfo["Default"];
for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it) // Add defaults for all missing effects
for(auto& shader : mShaders)
{ {
LLSD shader_defaults = (*it)->getDefaults(); const LLSD shader_defaults = shader->getDefaults();
for (LLSD::map_const_iterator it2 = defaults.beginMap();it2 != defaults.endMap();++it2) for (LLSD::map_const_iterator it2 = defaults.beginMap();it2 != defaults.endMap();++it2)
{ {
if(!defaults.has(it2->first)) if(!defaults.has(it2->first))
defaults[it2->first]=it2->second; defaults[it2->first]=it2->second;
} }
} }
for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
{
(*it)->loadSettings(defaults);
}
setSelectedEffect("Default"); setSelectedEffect("Default");
} }