Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -320,7 +320,6 @@ bool CResourceManager::LoadFastLoadPaks(bool bToMemory)
}
const char* const assetsDir = "@assets@";
const char* shaderPakDir = assetsDir;
const char* shaderPakPath = "ShaderCacheStartup.pak";
#if defined(AZ_RESTRICTED_PLATFORM)
@@ -826,8 +825,6 @@ void CResourceManager::OnSystemEvent(ESystemEvent event, [[maybe_unused]] UINT_P
//////////////////////////////////////////////////////////////////////////
void CResourceManager::GetMemoryStatistics(ICrySizer* pSizer)
{
auto pResList = gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level);
pSizer->AddContainer(m_openedPaks);
}