From d73cdeb2487bbd21d2eb062a13d92199c85cda2f Mon Sep 17 00:00:00 2001
From: Bojidar Marinov
Date: Sun, 3 Jun 2018 16:32:23 +0300
Subject: Fix bugs related to bad handling of rotated/translated shapes in
 tilemap

Fixup #18529 and #12870
---
 scene/2d/tile_map.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scene')

diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index d88e148b2..439bc43f3 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -466,10 +466,12 @@ void TileMap::_update_dirty_quadrants() {
 						Transform2D xform;
 						xform.set_origin(offset.floor());
 
-						Vector2 shape_ofs = tile_set->tile_get_shape_offset(c.id, i);
+						Vector2 shape_ofs = shapes[i].shape_transform.get_origin();
 
 						_fix_cell_transform(xform, c, shape_ofs + center_ofs, s);
 
+						xform *= shapes[i].shape_transform.untranslated();
+
 						if (debug_canvas_item.is_valid()) {
 							vs->canvas_item_add_set_transform(debug_canvas_item, xform);
 							shape->draw(debug_canvas_item, debug_collision_color);
-- 
cgit v1.2.3-70-g09d2