maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #47298 from reduz/remove-keep-files-error

Browse source 
Remove FileSystem dock errors on unimported files
This commit is contained in:
Rémi Verschelde 2021-03-23 15:44:40 +01:00 committed by GitHub
parent cd05653e30 4706297356
commit 538daf6731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
editor/filesystem_dock.cpp
View file

@ -944,6 +944,21 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
fpath = fpath.substr(0, fpath.length() - 1);
}
} else if (fpath != "Favorites") {
if (FileAccess::exists(fpath + ".import")) {
Ref<ConfigFile> config;
config.instance();
Error err = config->load(fpath + ".import");
if (err == OK) {
if (config->has_section_key("remap", "importer")) {
String importer = config->get_value("remap", "importer");
if (importer == "keep") {
EditorNode::get_singleton()->show_warning(TTR("Importing has been disabled for this file, so it can't be opened for editing."));
return;
}
}
}
}
if (ResourceLoader::get_resource_type(fpath) == "PackedScene") {
bool is_imported = false;
@ -2644,7 +2659,10 @@ void FileSystemDock::_update_import_dock() {
break;
}
String type = cf->get_value("remap", "type");
String type;
if (cf->has_section_key("remap", "type")) {
type = cf->get_value("remap", "type");
}
if (import_type == "") {
import_type = type;
} else if (import_type != type) {