From 655b32187f7ab34fe8acc708ef3b3fb18c82f08f Mon Sep 17 00:00:00 2001 From: mara Date: Wed, 25 Jan 2023 08:55:42 +0000 Subject: Fix: use the right tile_set in TilesEditorPlugin::_thread Instead of using the class member, use the item's tile set, as is the intent. This fixes an almost immediate crash in the editor for me. --- editor/plugins/tiles/tiles_editor_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editor/plugins/tiles/tiles_editor_plugin.cpp') diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/editor/plugins/tiles/tiles_editor_plugin.cpp index 19ee0ae98d..77dd0f7793 100644 --- a/editor/plugins/tiles/tiles_editor_plugin.cpp +++ b/editor/plugins/tiles/tiles_editor_plugin.cpp @@ -101,7 +101,7 @@ void TilesEditorPlugin::_thread() { encompassing_rect.expand_to(world_pos); // Texture. - Ref atlas_source = tile_set->get_source(tile_map->get_cell_source_id(0, cell)); + Ref atlas_source = item.tile_set->get_source(tile_map->get_cell_source_id(0, cell)); if (atlas_source.is_valid()) { Vector2i coords = tile_map->get_cell_atlas_coords(0, cell); int alternative = tile_map->get_cell_alternative_tile(0, cell); -- cgit v1.2.3