diff options
| author | Wilson E. Alvarez | 2017-08-12 12:52:50 -0400 |
|---|---|---|
| committer | Wilson E. Alvarez | 2017-08-12 15:12:49 -0400 |
| commit | 428f03cf06d3841b2a593f46aa42912ef5c82f3c (patch) | |
| tree | c006361e19c5ecbc02534496f936d1a4a5ad6ef3 /editor/plugins/tile_set_editor_plugin.cpp | |
| parent | 5052cb2b9104f57d0ff38d80da50bbeceb926e6f (diff) | |
| download | godot-428f03cf06d3841b2a593f46aa42912ef5c82f3c.tar.gz godot-428f03cf06d3841b2a593f46aa42912ef5c82f3c.tar.zst godot-428f03cf06d3841b2a593f46aa42912ef5c82f3c.zip | |
Diffstat (limited to 'editor/plugins/tile_set_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index 3563f70d0..bed4727bb 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -147,12 +147,12 @@ void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) { } } -void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_merge) { +void TileSetEditor::_import_scene(Node *p_scene, Ref<TileSet> p_library, bool p_merge) { if (!p_merge) p_library->clear(); - _import_node(scene, p_library); + _import_node(p_scene, p_library); } void TileSetEditor::_menu_confirm() { |