Browse Source

Merge pull request #46638 from Ev1lbl0w/feature-hide_gdignored_dirs

Rémi Verschelde 3 years ago
parent
commit
188ca5470b
1 changed files with 8 additions and 1 deletions
  1. 8 1
      editor/editor_file_dialog.cpp

+ 8 - 1
editor/editor_file_dialog.cpp

@@ -781,12 +781,19 @@ void EditorFileDialog::update_file_list() {
 			continue;
 			continue;
 		}
 		}
 
 
-		if (show_hidden_files || !dir_access->current_is_hidden()) {
+		if (show_hidden_files) {
 			if (!dir_access->current_is_dir()) {
 			if (!dir_access->current_is_dir()) {
 				files.push_back(item);
 				files.push_back(item);
 			} else {
 			} else {
 				dirs.push_back(item);
 				dirs.push_back(item);
 			}
 			}
+		} else if (!dir_access->current_is_hidden()) {
+			String full_path = cdir == "res://" ? item : dir_access->get_current_dir() + "/" + item;
+			if (dir_access->current_is_dir() && !EditorFileSystem::_should_skip_directory(full_path)) {
+				dirs.push_back(item);
+			} else {
+				files.push_back(item);
+			}
 		}
 		}
 		item = dir_access->get_next();
 		item = dir_access->get_next();
 	}
 	}