Merge pull request #1826 from eehrich/master

Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index 94e887c3e7..8e96123c36 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;