diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-18 11:29:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-18 11:29:14 +0100 |
commit | aef799f1fa973e8b0f678f0e82549ec2534bc282 (patch) | |
tree | ef4b74340155502dc9f242a44fd9e24deaefe0c0 | |
parent | 9f5045f70f3d34735074651d951d5c219b163ed3 (diff) | |
parent | 1078c389f993e9f2107af148eeb6c8a0311d3183 (diff) |
Merge pull request #56046 from timothyqiu/map-pattern
Fix crash when executing `TileMap.map_pattern`
-rw-r--r-- | scene/2d/tile_map.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 084a5a520d..2ad6476812 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -2104,6 +2104,7 @@ Ref<TileMapPattern> TileMap::get_pattern(int p_layer, TypedArray<Vector2i> p_coo } Vector2i TileMap::map_pattern(Vector2i p_position_in_tilemap, Vector2i p_coords_in_pattern, Ref<TileMapPattern> p_pattern) { + ERR_FAIL_COND_V(p_pattern.is_null(), Vector2i()); ERR_FAIL_COND_V(!p_pattern->has_cell(p_coords_in_pattern), Vector2i()); Vector2i output = p_position_in_tilemap + p_coords_in_pattern; |