Merge pull request #64013 from smix8/nav_tilemap_parent_transform_err…

…or_3.x
godotengine · Aug 6, 2022 · 45e42df · 45e42df
2 parents 7637b5d + 30d4555
commit 45e42df
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
@@ -157,7 +157,11 @@ void TileMap::_update_quadrant_transform() {
 
 	Transform2D nav_rel;
 	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()) {
@@ -339,7 +343,11 @@ void TileMap::update_dirty_quadrants() {
 	Vector2 tofs = get_cell_draw_offset();
 	Transform2D nav_rel;
 	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;