diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-26 10:09:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 10:09:43 +0100 |
| commit | 3a4c128f07cb744ed37529d8206e04cd0fa2e374 (patch) | |
| tree | a85530c55c2fbaa9502a1136298e0cba4b8c594c /main | |
| parent | fc5a400ce28c600da6ff4c40941e81d8ee588e53 (diff) | |
| parent | c143b5c6770c690e46545e17c7b28bee698e5a3a (diff) | |
Merge pull request #36551 from AndreaCatania/navigation_destruction_flush
Flushes commands just before the navigation server is destroyed
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index e3747fc48c..d8a9cc87a7 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -203,6 +203,7 @@ void finalize_physics() { void initialize_navigation_server() { ERR_FAIL_COND(navigation_server != NULL); + navigation_server = NavigationServerManager::new_default_server(); navigation_2d_server = memnew(Navigation2DServer); } @@ -210,6 +211,7 @@ void initialize_navigation_server() { void finalize_navigation_server() { memdelete(navigation_server); navigation_server = NULL; + memdelete(navigation_2d_server); navigation_2d_server = NULL; } @@ -2037,9 +2039,9 @@ bool Main::iteration() { break; } - message_queue->flush(); + NavigationServer::get_singleton_mut()->process(frame_slice * time_scale); - NavigationServer::get_singleton_mut()->step(frame_slice * time_scale); + message_queue->flush(); PhysicsServer::get_singleton()->step(frame_slice * time_scale); |