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

Merge pull request #64013 from smix8/nav_tilemap_parent_transform_error_3.x

This commit is contained in:
Rémi Verschelde 2022-08-06 22:22:30 +02:00 committed by GitHub
parent 7637b5d925 30d4555c65
commit 45e42dfed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/2d/tile_map.cpp
View File

@ -157,7 +157,11 @@ void TileMap::_update_quadrant_transform() {
Transform2D nav_rel; Transform2D nav_rel;
if (bake_navigation) { if (bake_navigation) {
nav_rel = get_relative_transform_to_parent(navigation); if (navigation) {
nav_rel = get_relative_transform_to_parent(navigation);
} else {
nav_rel = get_transform();
}
} }
for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) {
@ -339,7 +343,11 @@ void TileMap::update_dirty_quadrants() {
Vector2 tofs = get_cell_draw_offset(); Vector2 tofs = get_cell_draw_offset();
Transform2D nav_rel; Transform2D nav_rel;
if (bake_navigation) { if (bake_navigation) {
nav_rel = get_relative_transform_to_parent(navigation); if (navigation) {
nav_rel = get_relative_transform_to_parent(navigation);
} else {
nav_rel = get_transform();
}
} }
Vector2 qofs; Vector2 qofs;