Merge branch 'development' into Prefab/SaveAllPrefabs

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-08 14:11:50 -07:00
parent c7fbdb0ace 30cafff04d
commit 92986c7012
2167 changed files with 12739 additions and 36286 deletions
@@ -1940,16 +1940,6 @@ void CCryEditDoc::SetDocumentReady(bool bReady)
    m_bDocumentReady = bReady;
 }

-void CCryEditDoc::GetMemoryUsage(ICrySizer* pSizer) const
-{
-    {
-        SIZER_COMPONENT_NAME(pSizer, "UndoManager(estimate)");
-        GetIEditor()->GetUndoManager()->GetMemoryUsage(pSizer);
-    }
-
-    pSizer->Add(*this);
-}
-
 void CCryEditDoc::RegisterConsoleVariables()
 {
    doc_validate_surface_types = gEnv->pConsole->GetCVar("doc_validate_surface_types");