mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-iterator-badness' into 'master'

Browse Source 
Actually increment iterators to be erased.

Closes #6163

See merge request OpenMW/openmw!1027
This commit is contained in:
psi29a 2021-07-20 18:44:44 +00:00
commit 7c246b28e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/shader/shadervisitor.cpp
View File

@ -598,7 +598,7 @@ namespace Shader
for (auto itr = writableStateSet->getUniformList().begin(); itr != writableStateSet->getUniformList().end();)
{
if (addedState->hasUniform(itr->first))
writableStateSet->getUniformList().erase(itr);
writableStateSet->getUniformList().erase(itr++);
else
++itr;
}
@ -606,7 +606,7 @@ namespace Shader
for (auto itr = writableStateSet->getModeList().begin(); itr != writableStateSet->getModeList().end();)
{
if (addedState->hasMode(itr->first))
writableStateSet->getModeList().erase(itr);
writableStateSet->getModeList().erase(itr++);
else
++itr;
}