Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Updated function argument names

Browse source
This commit is contained in:
Wilson E. Alvarez 2017-08-12 12:52:50 -04:00
parent 5052cb2b91
commit 428f03cf06
74 changed files with 195 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/tile_set_editor_plugin.cpp
View file

@ -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() {