From fbda3c5d88bbe2112a257ff93caeed98f4e9873a Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Fri, 11 Dec 2015 09:37:34 -0300
Subject: -remove (can be added back in editor settings) icons from property
 editor -remove ".." from file dialog when opening res://, fixes #2994

---
 tools/editor/editor_file_dialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tools/editor/editor_file_dialog.cpp')

diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp
index 104539c30..7365cf906 100644
--- a/tools/editor/editor_file_dialog.cpp
+++ b/tools/editor/editor_file_dialog.cpp
@@ -435,6 +435,8 @@ void EditorFileDialog::update_file_list() {
 
 	}
 
+	String cdir = dir_access->get_current_dir();
+	bool skip_pp = access==ACCESS_RESOURCES && cdir=="res://";
 
 	dir_access->list_dir_begin();
 
@@ -455,7 +457,7 @@ void EditorFileDialog::update_file_list() {
 		if (show_hidden || !ishidden) {
 			if (!isdir)
 				files.push_back(item);
-			else
+			else if (item!=".." || !skip_pp)
 				dirs.push_back(item);
 		}
 	}
-- 
cgit v1.2.3-70-g09d2