From 0db526d1c84420cb60dba2addfe5cd1f19409906 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 13 Mar 2021 14:54:56 +0100 Subject: [PATCH] Check for already loaded assets when loading asset dependencies --- src/ObjLoading/AssetLoading/AssetLoadingManager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp b/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp index 5d6b9f24..01ae0d13 100644 --- a/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp +++ b/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp @@ -22,6 +22,10 @@ void AssetLoadingManager::AddAsset(const asset_type_t assetType, const std::stri XAssetInfoGeneric* AssetLoadingManager::LoadDependency(const asset_type_t assetType, const std::string& assetName) { + auto* existingAsset = m_context.m_zone->m_pools->GetAsset(assetType, assetName); + if (existingAsset) + return existingAsset; + const auto loader = m_asset_loaders_by_type.find(assetType); if (loader != m_asset_loaders_by_type.end()) {