Merge pull request #92288 from smix8/navregion_debug

akien-mga · akien-mga · commit b7feebefabc2 · 2024-05-23T23:26:04.000+02:00
Fix NavigationRegion3D not reacting to runtime debug enabled change
diff --git a/scene/3d/navigation_region_3d.cpp b/scene/3d/navigation_region_3d.cpp
@@ -474,7 +474,7 @@ void NavigationRegion3D::_update_debug_mesh() {
 		return;
 	}
 
-	if (!NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {
+	if (!NavigationServer3D::get_singleton()->get_debug_enabled() || !NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {
 		if (debug_instance.is_valid()) {
 			RS::get_singleton()->instance_set_visible(debug_instance, false);
 		}
@@ -640,7 +640,7 @@ void NavigationRegion3D::_update_debug_mesh() {
 
 #ifdef DEBUG_ENABLED
 void NavigationRegion3D::_update_debug_edge_connections_mesh() {
-	if (!NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {
+	if (!NavigationServer3D::get_singleton()->get_debug_enabled() || !NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {
 		if (debug_edge_connections_instance.is_valid()) {
 			RS::get_singleton()->instance_set_visible(debug_edge_connections_instance, false);
 		}

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ void NavigationRegion3D::_update_debug_mesh() {`
`474`	`474`	`return;`
`475`	`475`	`}`
`476`	`476`
`477`		`- if (!NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {`
	`477`	`+ if (!NavigationServer3D::get_singleton()->get_debug_enabled() \|\| !NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {`
`478`	`478`	`if (debug_instance.is_valid()) {`
`479`	`479`	`RS::get_singleton()->instance_set_visible(debug_instance, false);`
`480`	`480`	`}`
`@@ -640,7 +640,7 @@ void NavigationRegion3D::_update_debug_mesh() {`
`640`	`640`
`641`	`641`	`#ifdef DEBUG_ENABLED`
`642`	`642`	`void NavigationRegion3D::_update_debug_edge_connections_mesh() {`
`643`		`- if (!NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {`
	`643`	`+ if (!NavigationServer3D::get_singleton()->get_debug_enabled() \|\| !NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {`
`644`	`644`	`if (debug_edge_connections_instance.is_valid()) {`
`645`	`645`	`RS::get_singleton()->instance_set_visible(debug_edge_connections_instance, false);`
`646`	`646`	`}`