diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-24 18:36:56 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-24 18:36:56 +0200 |
| commit | 4c677c88e918e22ad696f225d189124444f9665e (patch) | |
| tree | f034f7e2de1316d9024d434cfb7522746ef2ae08 | |
| parent | 95bea896da7e48f94e7c104c220601fdc40a5372 (diff) | |
| parent | 9128ce95ced884bcfea0743e6724f0a9b40fb995 (diff) | |
| download | redot-engine-4c677c88e918e22ad696f225d189124444f9665e.tar.gz | |
Merge pull request #77440 from KoBeWi/set_pattern_which_doesn't_exist
Check for null in `set_pattern()`
| -rw-r--r-- | scene/2d/tile_map.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 35f57607ec..63fa8cdd35 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -2334,7 +2334,8 @@ Vector2i TileMap::map_pattern(const Vector2i &p_position_in_tilemap, const Vecto void TileMap::set_pattern(int p_layer, const Vector2i &p_position, const Ref<TileMapPattern> p_pattern) { ERR_FAIL_INDEX(p_layer, (int)layers.size()); - ERR_FAIL_COND(!tile_set.is_valid()); + ERR_FAIL_COND(tile_set.is_null()); + ERR_FAIL_COND(p_pattern.is_null()); TypedArray<Vector2i> used_cells = p_pattern->get_used_cells(); for (int i = 0; i < used_cells.size(); i++) { |