aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/editor_file_dialog.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2015-12-11 09:37:34 -0300
committerJuan Linietsky2015-12-11 09:37:34 -0300
commitfbda3c5d88bbe2112a257ff93caeed98f4e9873a (patch)
treea85d4ea3a82cc613d1902ba093a255ef5c855e6c /tools/editor/editor_file_dialog.cpp
parent46497c450854d0dfee60d8b64e141a303f4e99b3 (diff)
downloadgodot-fbda3c5d88bbe2112a257ff93caeed98f4e9873a.tar.gz
godot-fbda3c5d88bbe2112a257ff93caeed98f4e9873a.tar.zst
godot-fbda3c5d88bbe2112a257ff93caeed98f4e9873a.zip
-remove (can be added back in editor settings) icons from property editor
-remove ".." from file dialog when opening res://, fixes #2994
Diffstat (limited to 'tools/editor/editor_file_dialog.cpp')
-rw-r--r--tools/editor/editor_file_dialog.cpp4
1 files changed, 3 insertions, 1 deletions
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);
}
}