godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79465 from smix8/navregion_bake_deferred_4.x 

Make NavigationRegion3D baking NavMesh on the main thread not finish deferred
This commit is contained in:
Yuri Sizov 2023-07-18 13:15:15 +02:00
parent f8f06d3d38 bb5f16033d
commit 182b94c86a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/3d/navigation_region_3d.cpp
View File

@ -261,11 +261,19 @@ void _bake_navigation_mesh(void *p_user_data) {
Ref<NavigationMeshSourceGeometryData3D> source_geometry_data = args->source_geometry_data;
NavigationServer3D::get_singleton()->bake_from_source_geometry_data(nav_mesh, source_geometry_data);
args->nav_region->call_deferred(SNAME("_bake_finished"), nav_mesh);
if (!Thread::is_main_thread()) {
args->nav_region->call_deferred(SNAME("_bake_finished"), nav_mesh);
} else {
args->nav_region->_bake_finished(nav_mesh);
}
memdelete(args);
} else {
ERR_PRINT("Can't bake the navigation mesh if the `NavigationMesh` resource doesn't exist");
args->nav_region->call_deferred(SNAME("_bake_finished"), Ref<NavigationMesh>());
if (!Thread::is_main_thread()) {
args->nav_region->call_deferred(SNAME("_bake_finished"), Ref<NavigationMesh>());
} else {
args->nav_region->_bake_finished(Ref<NavigationMesh>());
}
memdelete(args);
}
}