Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -112,7 +112,7 @@ public:
    void Free()
    {
        m_nCount = 0;
-        if (m_nAllocatedCount)
+        if (m_nAllocatedCount && AZ::AllocatorInstance<CryLegacySTLAllocator>::IsReady())
        {
            AZ::AllocatorInstance<CryLegacySTLAllocator>::Get().DeAllocate(m_pElements);
        }