summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorGilles Roudière <gilles.roudiere@gmail.com>2021-10-14 16:48:03 +0200
committerGilles Roudière <gilles.roudiere@gmail.com>2021-10-14 16:49:59 +0200
commit3948f9cc83aa96556f24e2576aceb84d40e2774a (patch)
tree7ae28a0f389e7e33be4f2d2153c6d45275471128 /scene/resources
parentbf322bacdd99cdb81bd7870b0b196ef01652581c (diff)
Fixes crash in TileSetAtlasSource::get_tiles_to_be_removed_on_change
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/tile_set.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp
index 275b430f2a..b988b2ab3e 100644
--- a/scene/resources/tile_set.cpp
+++ b/scene/resources/tile_set.cpp
@@ -3565,6 +3565,10 @@ bool TileSetAtlasSource::has_room_for_tile(Vector2i p_atlas_coords, Vector2i p_s
}
PackedVector2Array TileSetAtlasSource::get_tiles_to_be_removed_on_change(Ref<Texture2D> p_texture, Vector2i p_margins, Vector2i p_separation, Vector2i p_texture_region_size) {
+ ERR_FAIL_COND_V(p_margins.x < 0 || p_margins.y < 0, PackedVector2Array());
+ ERR_FAIL_COND_V(p_separation.x < 0 || p_separation.y < 0, PackedVector2Array());
+ ERR_FAIL_COND_V(p_texture_region_size.x <= 0 || p_texture_region_size.y <= 0, PackedVector2Array());
+
// Compute the new atlas grid size.
Size2 new_grid_size;
if (p_texture.is_valid()) {