summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-06-23 16:13:12 +0200
committerGitHub <noreply@github.com>2022-06-23 16:13:12 +0200
commitbdd41a836c50ac1e69113a7e284ed2a2f72fc379 (patch)
treee963934f8bda9f07d69602c4aa4ee5df4776dbf7
parentef5bc1baad3e8bfd5755e74b8644ab3bd64855e6 (diff)
parent24bb0af4a9ae7d2c9f56c20f3d3c6a4568fc9bf5 (diff)
Merge pull request #62293 from smix8/navigation_disable_editorprogress_bake_4.x
-rw-r--r--modules/navigation/navigation_mesh_generator.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/navigation/navigation_mesh_generator.cpp b/modules/navigation/navigation_mesh_generator.cpp
index c620776dc6..6e8ac77f79 100644
--- a/modules/navigation/navigation_mesh_generator.cpp
+++ b/modules/navigation/navigation_mesh_generator.cpp
@@ -646,6 +646,13 @@ void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node)
#ifdef TOOLS_ENABLED
EditorProgress *ep(nullptr);
+ // FIXME
+#endif
+#if 0
+ // After discussion on devchat disabled EditorProgress for now as it is not thread-safe and uses hacks and Main::iteration() for steps.
+ // EditorProgress randomly crashes the Engine when the bake function is used with a thread e.g. inside Editor with a tool script and procedural navigation
+ // This was not a problem in older versions as previously Godot was unable to (re)bake NavigationMesh at runtime.
+ // If EditorProgress is fixed and made thread-safe this should be enabled again.
if (Engine::get_singleton()->is_editor_hint()) {
ep = memnew(EditorProgress("bake", TTR("Navigation Mesh Generator Setup:"), 11));
}