asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #67141 from smix8/gridmap_fix_meshlib_replace_3.x

Browse source 
Fix Editor crash when MeshLibrary gets replaced while used in an open Scene
This commit is contained in:
Rémi Verschelde 2022-10-14 16:33:29 +02:00
commit 567d5e2f78
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/gridmap/grid_map.cpp
View file

@ -561,10 +561,12 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
NavigationServer::get_singleton()->region_set_navigation_layers(region, navigation_layers); NavigationServer::get_singleton()->region_set_navigation_layers(region, navigation_layers);
NavigationServer::get_singleton()->region_set_navmesh(region, navmesh); NavigationServer::get_singleton()->region_set_navmesh(region, navmesh);
NavigationServer::get_singleton()->region_set_transform(region, get_global_transform() * nm.xform); NavigationServer::get_singleton()->region_set_transform(region, get_global_transform() * nm.xform);
if (navigation) { if (is_inside_tree()) {
NavigationServer::get_singleton()->region_set_map(region, navigation->get_rid()); if (navigation) {
} else { NavigationServer::get_singleton()->region_set_map(region, navigation->get_rid());
NavigationServer::get_singleton()->region_set_map(region, get_world()->get_navigation_map()); } else {
NavigationServer::get_singleton()->region_set_map(region, get_world()->get_navigation_map());
}
} }
nm.region = region; nm.region = region;