diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-22 10:13:01 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-22 10:13:01 +0100 |
commit | 44e96901086c20285e4f07e04504d6b901f98ed2 (patch) | |
tree | c8acfc7b0b51cd49ca060f8f55c003710ff4c751 /scene | |
parent | 91aed4b9b58ea40e1918e393fdfe6dc729f20269 (diff) | |
parent | a899f547ae62b97e08ce3a978bfeb17fe879bcda (diff) |
Merge pull request #73714 from KoBeWi/tireset
Fix reset_state() in TileSet
Diffstat (limited to 'scene')
-rw-r--r-- | scene/resources/tile_set.cpp | 5 | ||||
-rw-r--r-- | scene/resources/tile_set.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index d4b2be355e..efe04ce4e1 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -2527,6 +2527,11 @@ void TileSet::reset_state() { while (!source_ids.is_empty()) { remove_source(source_ids[0]); } + + tile_shape = TILE_SHAPE_SQUARE; + tile_layout = TILE_LAYOUT_STACKED; + tile_offset_axis = TILE_OFFSET_AXIS_HORIZONTAL; + tile_size = Size2i(16, 16); } const Vector2i TileSetSource::INVALID_ATLAS_COORDS = Vector2i(-1, -1); diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index ad25629a1c..d62bac8570 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -308,7 +308,6 @@ private: TileLayout tile_layout = TILE_LAYOUT_STACKED; TileOffsetAxis tile_offset_axis = TILE_OFFSET_AXIS_HORIZONTAL; Size2i tile_size = Size2i(16, 16); //Size2(64, 64); - Vector2 tile_skew = Vector2(0, 0); // Rendering. bool uv_clipping = false; |