Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -655,17 +655,6 @@ QString CEditorImpl::GetResolvedUserFolder()
    return m_userFolder;
 }

-QString CEditorImpl::GetProjectName()
-{
-    ICVar* pCVar = (gEnv && gEnv->pConsole) ? gEnv->pConsole->GetCVar("sys_game_folder") : nullptr;
-    if (pCVar && pCVar->GetString())
-    {
-        return QString(pCVar->GetString());
-    }
-
-    return tr("unknown");
-}
-
 void CEditorImpl::SetDataModified()
 {
    GetDocument()->SetModifiedFlag(TRUE);