diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 11:07:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 11:10:42 -0300 |
| commit | dcb95ec1473eff3f455909cd81c3cd50b1e1159b (patch) | |
| tree | 60343275911d48ebf993041dec92e1eac112b746 /tools/editor/editor_file_system.cpp | |
| parent | 93ab45b6b5c4f8e0619e963156c983009d399a9d (diff) | |
removed duplicated functions in class hierarchy that were bound more than once
added a check to detect this case in the future
Diffstat (limited to 'tools/editor/editor_file_system.cpp')
| -rw-r--r-- | tools/editor/editor_file_system.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp index 4a79a208e2..1d32415be9 100644 --- a/tools/editor/editor_file_system.cpp +++ b/tools/editor/editor_file_system.cpp @@ -1198,7 +1198,7 @@ EditorFileSystemDirectory* EditorFileSystem::find_file(const String& p_file,int* } -EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) { +EditorFileSystemDirectory *EditorFileSystem::get_filesystem_path(const String& p_path) { if (!filesystem || scanning) return NULL; @@ -1352,7 +1352,7 @@ void EditorFileSystem::_bind_methods() { ClassDB::bind_method(_MD("scan"),&EditorFileSystem::scan); ClassDB::bind_method(_MD("scan_sources"),&EditorFileSystem::scan_sources); ClassDB::bind_method(_MD("update_file","path"),&EditorFileSystem::update_file); - ClassDB::bind_method(_MD("get_path:EditorFileSystemDirectory","path"),&EditorFileSystem::get_path); + ClassDB::bind_method(_MD("get_filesystem_path:EditorFileSystemDirectory","path"),&EditorFileSystem::get_filesystem_path); ClassDB::bind_method(_MD("get_file_type","path"),&EditorFileSystem::get_file_type); ADD_SIGNAL( MethodInfo("filesystem_changed") ); |