summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-05-30 12:52:23 +0200
committerGitHub <noreply@github.com>2019-05-30 12:52:23 +0200
commit24dd8e29ea77b5e9c5f3ab5ffd4bf19532bacf4c (patch)
tree37054d304038b1da726a30f0655741de759c28b3 /editor
parent9d6294c78a340c6452f0b3f11a67c186647d6ed7 (diff)
parent4f4513f99ce2ed679b571e2dc96ba8ab4dd914a9 (diff)
Merge pull request #29296 from jbuck3/cleanup
Remove some redundant lines
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_file_dialog.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
index 724b821267..3d198dec67 100644
--- a/editor/editor_file_dialog.cpp
+++ b/editor/editor_file_dialog.cpp
@@ -710,7 +710,6 @@ 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();
@@ -733,7 +732,7 @@ void EditorFileDialog::update_file_list() {
if (show_hidden || !ishidden) {
if (!isdir)
files.push_back(item);
- else if (item != ".." || !skip_pp)
+ else
dirs.push_back(item);
}
}
@@ -764,8 +763,6 @@ void EditorFileDialog::update_file_list() {
dirs.pop_front();
}
- dirs.clear();
-
List<String> patterns;
// build filter
if (filter->get_selected() == filter->get_item_count() - 1) {
@@ -864,8 +861,6 @@ void EditorFileDialog::update_file_list() {
break;
}
}
-
- files.clear();
}
void EditorFileDialog::_filter_selected(int) {