diff options
| author | Juan Linietsky | 2015-05-09 13:09:20 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-09 13:09:20 -0300 |
| commit | 1fd1b7a91b2f60a2841b9684e1e41728275cedaf (patch) | |
| tree | 17678512dde4890e941c78ba90ba23b184e2ae9a /tools/editor/editor_file_system.cpp | |
| parent | 1a7d370fcf7382a9e248925a7eef12d28e0bb9e3 (diff) | |
| parent | 158785636c809d5ebdb6995a088c7776ce45e65c (diff) | |
| download | godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.tar.gz godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.tar.zst godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/editor_file_system.cpp')
| -rw-r--r-- | tools/editor/editor_file_system.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp index 94e887c3e..8e96123c3 100644 --- a/tools/editor/editor_file_system.cpp +++ b/tools/editor/editor_file_system.cpp @@ -940,19 +940,19 @@ String EditorFileSystem::get_file_type(const String& p_file) const { EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) { if (!filesystem || scanning) - return false; + return NULL; String f = Globals::get_singleton()->localize_path(p_path); if (!f.begins_with("res://")) - return false; + return NULL; f=f.substr(6,f.length()); f=f.replace("\\","/"); if (f==String()) - return filesystem; + return filesystem; if (f.ends_with("/")) f=f.substr(0,f.length()-1); @@ -960,7 +960,7 @@ EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) { Vector<String> path = f.split("/"); if (path.size()==0) - return false; + return NULL; EditorFileSystemDirectory *fs=filesystem; |