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
+1 -3
View File
@@ -321,7 +321,7 @@ void KillMemory(IConsoleCmdArgs* /* pArgs */)
size = size > kLimit ? kLimit : size;
}
uint8* alloc = new uint8[size];
new uint8[size];
}
}
@@ -712,8 +712,6 @@ void CGameEngine::SwitchToInGame()
gEnv->p3DEngine->ResetParticlesAndDecals();
}
CViewport* pGameViewport = GetIEditor()->GetViewManager()->GetGameViewport();
m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(true);
m_bInGameMode = true;