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

Actually increment iterators to be erased.

Closes #6163

See merge request OpenMW/openmw!1027

(cherry picked from commit 7c246b28e7cb8c514b22214309fc9fed7fc40edc)

5ec2ddb4 Actually increment iterators to be erased.

components/shader/shadervisitor.cpp

@@ -603,7 +603,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;
             }
@@ -611,7 +611,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;
             }