1 files changed, 3 insertions, 5 deletions

diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 9d70b7502..57e25ec60 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -461,18 +461,16 @@ void TileMap::_update_dirty_quadrants() {
 					Transform2D xform;
 					xform.set_origin(offset.floor());
 
-					_fix_cell_transform(xform, c, center_ofs, s);
-
-					xform *= shapes[i].shape_transform;
+					_fix_cell_transform(xform, c, shapes[i].shape_offset + center_ofs, s);
 
 					if (debug_canvas_item.is_valid()) {
 						vs->canvas_item_add_set_transform(debug_canvas_item, xform);
 						shape->draw(debug_canvas_item, debug_collision_color);
 					}
 					ps->body_add_shape(q.body, shape->get_rid(), xform);
-					ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y));
-					ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[i].one_way_collision);
 					shape_idx++;
+					ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[i].one_way_collision);
+					ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y));
 				}
 			}