gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-15 23:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80462 from KoBeWi/tfw_your_bugfix_makes_things_worse

Browse source 
Fix TileSet with TileMap handling
This commit is contained in:
Rémi Verschelde 2023-08-10 00:44:13 +02:00
parent d76b97e904 f02133a4a2
commit 013e8e3afb
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editor/plugins/tiles/tiles_editor_plugin.cpp
View file

@ -38,7 +38,6 @@
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "editor/inspector_dock.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "scene/2d/tile_map.h"
@ -326,8 +325,17 @@ void TileMapEditorPlugin::_tile_map_changed() {
}
void TileMapEditorPlugin::_update_tile_map() {
if (tile_map && tile_map->get_tileset().is_valid()) {
EditorNode::get_singleton()->edit_item(tile_map->get_tileset().ptr(), InspectorDock::get_inspector_singleton());
if (tile_map) {
Ref<TileSet> tile_set = tile_map->get_tileset();
if (tile_set.is_valid() && edited_tileset != tile_set->get_instance_id()) {
tile_set_plugin_singleton->edit(tile_map->get_tileset().ptr());
tile_set_plugin_singleton->make_visible(true);
edited_tileset = tile_set->get_instance_id();
} else if (tile_set.is_null()) {
tile_set_plugin_singleton->edit(nullptr);
tile_set_plugin_singleton->make_visible(false);
edited_tileset = ObjectID();
}
}
tile_map_changed_needs_update = false;
}
@ -350,7 +358,9 @@ void TileMapEditorPlugin::edit(Object *p_object) {
tile_map->connect("changed", callable_mp(this, &TileMapEditorPlugin::_tile_map_changed));
if (tile_map->get_tileset().is_valid()) {
EditorNode::get_singleton()->edit_item(tile_map->get_tileset().ptr(), InspectorDock::get_inspector_singleton());
tile_set_plugin_singleton->edit(tile_map->get_tileset().ptr());
tile_set_plugin_singleton->make_visible(true);
edited_tileset = tile_map->get_tileset()->get_instance_id();
}
}
}

2
editor/plugins/tiles/tiles_editor_plugin.h
View file

@ -118,6 +118,8 @@ class TileMapEditorPlugin : public EditorPlugin {
TileMap *tile_map = nullptr;
bool tile_map_changed_needs_update = false;
ObjectID edited_tileset;
void _tile_map_changed();
void _update_tile_map();