godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TileSet editor was out of sync with TileMap and incorrectly overwrote old selected TileSet after an edit call with a null pointer.

Browse Source
This commit is contained in:
Niels Drost 2023-02-27 11:39:30 +01:00
parent 15a97a2e84
commit 66374c8dce
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/tiles/tiles_editor_plugin.cpp
View File

@ -145,7 +145,10 @@ void TilesEditorPlugin::_tile_map_changed() {
void TilesEditorPlugin::_update_editors() { void TilesEditorPlugin::_update_editors() {
// If tile_map is not edited, we change the edited only if we are not editing a tile_set. // If tile_map is not edited, we change the edited only if we are not editing a tile_set.
tileset_editor->edit(tile_set); if (tile_set.is_valid()) {
tileset_editor->edit(tile_set);
}
TileMap *tile_map = Object::cast_to<TileMap>(ObjectDB::get_instance(tile_map_id)); TileMap *tile_map = Object::cast_to<TileMap>(ObjectDB::get_instance(tile_map_id));
if (tile_map) { if (tile_map) {
tilemap_editor->edit(tile_map); tilemap_editor->edit(tile_map);
@ -158,6 +161,7 @@ void TilesEditorPlugin::_update_editors() {
// Make sure the tile set editor is visible if we have one assigned. // Make sure the tile set editor is visible if we have one assigned.
tileset_editor_button->set_visible(is_visible && tile_set.is_valid()); tileset_editor_button->set_visible(is_visible && tile_set.is_valid());
tilemap_editor_button->set_visible(is_visible && tile_map);
// Update visibility of bottom panel buttons. // Update visibility of bottom panel buttons.
if (tileset_editor_button->is_pressed() && !tile_set.is_valid()) { if (tileset_editor_button->is_pressed() && !tile_set.is_valid()) {