Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #83244 from KoBeWi/tile_map_is_now_tile_set_and_vice_versa

Browse Source 
Swap TileMap and TileSet buttons
This commit is contained in:
Rémi Verschelde 2023-10-13 11:47:55 +02:00
commit 37ee293be8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,7 +413,9 @@ bool TileMapEditorPlugin::is_editor_visible() const {
}
TileMapEditorPlugin::TileMapEditorPlugin() {
memnew(TilesEditorUtils);
if (!TilesEditorUtils::get_singleton()) {
memnew(TilesEditorUtils);
}
tile_map_plugin_singleton = this;
editor = memnew(TileMapEditor);
@ -462,7 +464,9 @@ ObjectID TileSetEditorPlugin::get_edited_tileset() const {
}
TileSetEditorPlugin::TileSetEditorPlugin() {
DEV_ASSERT(tile_map_plugin_singleton);
if (!TilesEditorUtils::get_singleton()) {
memnew(TilesEditorUtils);
}
tile_set_plugin_singleton = this;
editor = memnew(TileSetEditor);

2
editor/register_editor_types.cpp
View File

@ -257,8 +257,8 @@ void register_editor_types() {
EditorPlugins::add_by_type<Cast2DEditorPlugin>();
EditorPlugins::add_by_type<Skeleton2DEditorPlugin>();
EditorPlugins::add_by_type<Sprite2DEditorPlugin>();
EditorPlugins::add_by_type<TileMapEditorPlugin>();
EditorPlugins::add_by_type<TileSetEditorPlugin>();
EditorPlugins::add_by_type<TileMapEditorPlugin>();
// For correct doc generation.
GLOBAL_DEF("editor/run/main_run_args", "");