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

Swap TileMap and TileSet

Browse Source
This commit is contained in:
kobewi 2023-10-13 09:55:24 +02:00
parent ee118e7ffd
commit 291be2c66c
2 changed files with 7 additions and 3 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

@ -413,7 +413,9 @@ bool TileMapEditorPlugin::is_editor_visible() const {
} }
TileMapEditorPlugin::TileMapEditorPlugin() { TileMapEditorPlugin::TileMapEditorPlugin() {
if (!TilesEditorUtils::get_singleton()) {
memnew(TilesEditorUtils); memnew(TilesEditorUtils);
}
tile_map_plugin_singleton = this; tile_map_plugin_singleton = this;
editor = memnew(TileMapEditor); editor = memnew(TileMapEditor);
@ -462,7 +464,9 @@ ObjectID TileSetEditorPlugin::get_edited_tileset() const {
} }
TileSetEditorPlugin::TileSetEditorPlugin() { TileSetEditorPlugin::TileSetEditorPlugin() {
DEV_ASSERT(tile_map_plugin_singleton); if (!TilesEditorUtils::get_singleton()) {
memnew(TilesEditorUtils);
}
tile_set_plugin_singleton = this; tile_set_plugin_singleton = this;
editor = memnew(TileSetEditor); 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<Cast2DEditorPlugin>();
EditorPlugins::add_by_type<Skeleton2DEditorPlugin>(); EditorPlugins::add_by_type<Skeleton2DEditorPlugin>();
EditorPlugins::add_by_type<Sprite2DEditorPlugin>(); EditorPlugins::add_by_type<Sprite2DEditorPlugin>();
EditorPlugins::add_by_type<TileMapEditorPlugin>();
EditorPlugins::add_by_type<TileSetEditorPlugin>(); EditorPlugins::add_by_type<TileSetEditorPlugin>();
EditorPlugins::add_by_type<TileMapEditorPlugin>();
// For correct doc generation. // For correct doc generation.
GLOBAL_DEF("editor/run/main_run_args", ""); GLOBAL_DEF("editor/run/main_run_args", "");