Skip to content

Commit 334e580

Browse files
committed
Merge pull request #112271 from kleonc/tile_set_editor_fix_checking_outside_tiles
Check for tiles outside texture on TileSet atlas settings changes
2 parents efeb120 + d9cf67d commit 334e580

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,6 +2254,7 @@ void TileSetAtlasSourceEditor::init_new_atlases(const Vector<Ref<TileSetAtlasSou
22542254

22552255
void TileSetAtlasSourceEditor::_update_source_texture() {
22562256
if (tile_set_atlas_source && tile_set_atlas_source->get_texture() == atlas_source_texture) {
2257+
_check_outside_tiles();
22572258
return;
22582259
}
22592260

@@ -2272,8 +2273,9 @@ void TileSetAtlasSourceEditor::_update_source_texture() {
22722273

22732274
void TileSetAtlasSourceEditor::_check_outside_tiles() {
22742275
ERR_FAIL_NULL(tile_set_atlas_source);
2275-
outside_tiles_warning->set_visible(!read_only && tile_set_atlas_source->has_tiles_outside_texture());
2276-
tool_advanced_menu_button->get_popup()->set_item_disabled(tool_advanced_menu_button->get_popup()->get_item_index(ADVANCED_CLEANUP_TILES), !tile_set_atlas_source->has_tiles_outside_texture());
2276+
bool has_tiles_outside = tile_set_atlas_source->has_tiles_outside_texture();
2277+
outside_tiles_warning->set_visible(!read_only && has_tiles_outside);
2278+
tool_advanced_menu_button->get_popup()->set_item_disabled(tool_advanced_menu_button->get_popup()->get_item_index(ADVANCED_CLEANUP_TILES), !has_tiles_outside);
22772279
}
22782280

22792281
void TileSetAtlasSourceEditor::_cleanup_outside_tiles() {

0 commit comments

Comments
 (0)