From dcb95ec1473eff3f455909cd81c3cd50b1e1159b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 14 Jan 2017 11:07:57 -0300 Subject: removed duplicated functions in class hierarchy that were bound more than once added a check to detect this case in the future --- tools/editor/editor_file_system.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/editor/editor_file_system.cpp') 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") ); -- cgit v1.2.3