diff options
| author | Rémi Verschelde | 2017-08-16 17:17:56 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-16 17:17:56 +0200 |
| commit | b1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef (patch) | |
| tree | f02f5dac7b5a1c0e35c2290513b62f4873b81a93 /editor/plugins/tile_set_editor_plugin.cpp | |
| parent | ae78a13f59c5a4025d078084afae2737cf0d1454 (diff) | |
| parent | 428f03cf06d3841b2a593f46aa42912ef5c82f3c (diff) | |
| download | godot-b1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef.tar.gz godot-b1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef.tar.zst godot-b1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef.zip | |
Merge pull request #10307 from Rubonnek/update-argument-names
Updated function argument names
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() { |