Merge pull request #75361 from kleonc/tile-set-atlas-merging-crash-fix

`TileSet` editor `AtlasMergingDialog` crash fix
godotengine · Mar 28, 2023 · 23394be · 23394be
2 parents 1222d35 + c72b096
commit 23394be
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/editor/plugins/tiles/atlas_merging_dialog.cpp b/editor/plugins/tiles/atlas_merging_dialog.cpp
@@ -95,7 +95,9 @@ void AtlasMergingDialog::_generate_merged(Vector<Ref<TileSetAtlasSource>> p_atla
  }
  }
 
+ merged->set_name(p_atlas_sources[0]->get_name());
  merged->set_texture(ImageTexture::create_from_image(output_image));
+ merged->set_texture_region_size(new_texture_region_size);
 
  // Copy the tiles to the merged TileSetAtlasSource.
  for (int source_index = 0; source_index < p_atlas_sources.size(); source_index++) {
@@ -130,9 +132,6 @@ void AtlasMergingDialog::_generate_merged(Vector<Ref<TileSetAtlasSource>> p_atla
  }
  }
  }
-
- merged->set_name(p_atlas_sources[0]->get_name());
- merged->set_texture_region_size(new_texture_region_size);
  }
 }