From 4612597877e7817febe67b24dbd3e35900ce8b43 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 22 Nov 2017 20:54:39 +0000 Subject: [PATCH] Switch to insert_or_assign semantics when adding shadow defines to the global shader defines. --- apps/openmw/mwrender/renderingmanager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index c2ade69d9f..52bc8de3c3 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -240,7 +240,10 @@ namespace MWRender Shader::ShaderManager::DefineMap shadowDefines = tech->getShadowDefines(); Shader::ShaderManager::DefineMap globalDefines = mResourceSystem->getSceneManager()->getShaderManager().getGlobalDefines(); - globalDefines.insert(shadowDefines.begin(), shadowDefines.end()); + + for (auto itr = shadowDefines.begin(); itr != shadowDefines.end(); itr++) + globalDefines[itr->first] = itr->second; + mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(globalDefines); mPathgrid.reset(new Pathgrid(mRootNode));