diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-09-29 12:53:28 +0300 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-10-07 11:32:33 +0300 |
| commit | 0103af1ddda6a2aa31227965141dd7d3a513e081 (patch) | |
| tree | b0965bb65919bc1495ee02204a91e5ed3a9b56a7 /scene/resources/tile_set.cpp | |
| parent | 5b7f62af55b7f322192f95258d825b163cbf9dc1 (diff) | |
| download | redot-engine-0103af1ddda6a2aa31227965141dd7d3a513e081.tar.gz | |
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
Diffstat (limited to 'scene/resources/tile_set.cpp')
| -rw-r--r-- | scene/resources/tile_set.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 813be773b7..d7d7b5fe31 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -3779,14 +3779,14 @@ bool TileSetAtlasSource::get_use_texture_padding() const { } Vector2i TileSetAtlasSource::get_atlas_grid_size() const { - Ref<Texture2D> texture = get_texture(); - if (!texture.is_valid()) { + Ref<Texture2D> txt = get_texture(); + if (!txt.is_valid()) { return Vector2i(); } ERR_FAIL_COND_V(texture_region_size.x <= 0 || texture_region_size.y <= 0, Vector2i()); - Size2i valid_area = texture->get_size() - margins; + Size2i valid_area = txt->get_size() - margins; // Compute the number of valid tiles in the tiles atlas Size2i grid_size = Size2i(); |