TileSet Fix crash in AtlasMergingDialog
#75361
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kleonc
commented
Mar 26, 2023
KoBeWi
reviewed
Mar 28, 2023
kleonc
force-pushed
the
tile-set-atlas-merging-crash-fix
branch
from
c46fb54
to
c72b096
Compare
KoBeWi
approved these changes
Mar 28, 2023
|
Thanks! |
|
Cherry-picked for 4.0.2. |
YuriSizov
changed the title
TileSet editor AtlasMergingDialog crash fixTileSet Fix crash in AtlasMergingDialog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When generating the
mergedTileSetAtlasSource the newly calculatednew_texture_region_sizewas being set after creating tiles within such source. Hence during tiles creation itstexture_region_sizewas the default(16, 16)instead of thenew_texture_region_size. When any dimension ofnew_texture_region_sizewas smaller than 16 then the tile would fail to be created as it would be determined to not fit within the new texture. Hence later obtaining such tile's data would fail (as it was not created) and thusnullptrwould be dereferenced when trying to copy the properties (which caused the crash).This PR makes the
new_texture_region_sizebe set before copying the tiles so the checks should not fail like before.Fixes #75354.