asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #77382 from rakkarage/tileset_merge_crash

Browse source 
Fix crash when using tile atlas merge with recreated alt tile
This commit is contained in:
Rémi Verschelde 2023-05-26 11:23:03 +02:00 committed by GitHub
commit 95d745f8dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/plugins/tiles/atlas_merging_dialog.cpp
View file

@ -105,10 +105,11 @@ void AtlasMergingDialog::_generate_merged(Vector<Ref<TileSetAtlasSource>> p_atla
// Create tiles and alternatives, then copy their properties. // Create tiles and alternatives, then copy their properties.
for (int alternative_index = 0; alternative_index < atlas_source->get_alternative_tiles_count(tile_mapping.key); alternative_index++) { for (int alternative_index = 0; alternative_index < atlas_source->get_alternative_tiles_count(tile_mapping.key); alternative_index++) {
int alternative_id = atlas_source->get_alternative_tile_id(tile_mapping.key, alternative_index); int alternative_id = atlas_source->get_alternative_tile_id(tile_mapping.key, alternative_index);
int changed_id = -1;
if (alternative_id == 0) { if (alternative_id == 0) {
merged->create_tile(tile_mapping.value, atlas_source->get_tile_size_in_atlas(tile_mapping.key)); merged->create_tile(tile_mapping.value, atlas_source->get_tile_size_in_atlas(tile_mapping.key));
} else { } else {
merged->create_alternative_tile(tile_mapping.value, alternative_index); changed_id = merged->create_alternative_tile(tile_mapping.value, alternative_index);
} }
// Copy the properties. // Copy the properties.
@ -116,7 +117,7 @@ void AtlasMergingDialog::_generate_merged(Vector<Ref<TileSetAtlasSource>> p_atla
List<PropertyInfo> properties; List<PropertyInfo> properties;
src_tile_data->get_property_list(&properties); src_tile_data->get_property_list(&properties);
TileData *dst_tile_data = merged->get_tile_data(tile_mapping.value, alternative_id); TileData *dst_tile_data = merged->get_tile_data(tile_mapping.value, changed_id == -1 ? alternative_id : changed_id);
for (PropertyInfo property : properties) { for (PropertyInfo property : properties) {
if (!(property.usage & PROPERTY_USAGE_STORAGE)) { if (!(property.usage & PROPERTY_USAGE_STORAGE)) {
continue; continue;