From 6acbd0e2be8a886149fcfa68a1860277aff39d0c Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 28 Mar 2021 13:08:28 +0200 Subject: [PATCH] Make asset loading context assets in gdts override their previously defined assets with the same name --- src/ObjLoading/AssetLoading/AssetLoadingContext.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ObjLoading/AssetLoading/AssetLoadingContext.cpp b/src/ObjLoading/AssetLoading/AssetLoadingContext.cpp index 07e01968..76a0f72e 100644 --- a/src/ObjLoading/AssetLoading/AssetLoadingContext.cpp +++ b/src/ObjLoading/AssetLoading/AssetLoadingContext.cpp @@ -23,7 +23,12 @@ void AssetLoadingContext::BuildGdtEntryCache() } else { - gdfMapEntry->second.emplace(std::make_pair(entry->m_name, entry.get())); + auto entryMapEntry = gdfMapEntry->second.find(entry->m_name); + + if (entryMapEntry == gdfMapEntry->second.end()) + gdfMapEntry->second.emplace(std::make_pair(entry->m_name, entry.get())); + else + entryMapEntry->second = entry.get(); } } }