Merge remote-tracking branch 'origin/master' into 1.1

# Conflicts: # Source/Engine/Navigation/NavMesh.cpp # Source/Engine/Navigation/NavMeshBuilder.cpp
2021-01-22 11:31:22 +01:00
parent cbbfb16628 8680aba897
commit 6cbeac6537
178 changed files with 1163 additions and 864 deletions
--- a/Source/Engine/Engine/Engine.cpp
+++ b/Source/Engine/Engine/Engine.cpp
@@ -468,7 +468,7 @@ void Engine::OnExit()

    LOG_FLUSH();

-    // Kill all reaming threads
+    // Kill all remaining threads
    ThreadRegistry::KillEmAll();

    // Cleanup