From c86f9f63910066100d68a38fcd633fc74661dc7e Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 11 Jan 2025 11:57:09 +0100 Subject: [PATCH] fix: not accessing previous zone data when taking an asset from global asset pools --- src/ObjLoading/Asset/GlobalAssetPoolsLoader.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h b/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h index b9f3bd23..6aeeb76f 100644 --- a/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h +++ b/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h @@ -38,7 +38,12 @@ public: for (const auto scrString : existingAsset->m_used_script_strings) m_zone.m_script_strings.AddOrGetScriptString(existingAsset->m_zone->m_script_strings.CValue(scrString)); - return AssetCreationResult::Success(context.AddAsset(std::move(registration))); + auto* newAsset = context.AddAsset(std::move(registration)); + + // Make sure we remember this asset came from another zone + newAsset->m_zone = existingAsset->m_zone; + + return AssetCreationResult::Success(newAsset); } private: