Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #92320 from Hilderin/fix-importing-assets-with-csv

Browse source 
Fix reimporting assets with csv in the project
This commit is contained in:
Rémi Verschelde 2024-06-21 13:54:35 +02:00
commit 74f9f12c71
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/io/resource_importer.cpp
View file

@ -118,9 +118,21 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
}
#endif
if (r_path_and_type.path.is_empty() || r_path_and_type.type.is_empty()) {
if (r_path_and_type.type.is_empty()) {
return ERR_FILE_CORRUPT;
}
if (r_path_and_type.path.is_empty()) {
// Some importers may not write files to the .godot folder, so the path can be empty.
if (r_path_and_type.importer.is_empty()) {
return ERR_FILE_CORRUPT;
}
// It's only invalid if the extension for the importer is not empty.
Ref<ResourceImporter> importer = get_importer_by_name(r_path_and_type.importer);
if (importer.is_null() || !importer->get_save_extension().is_empty()) {
return ERR_FILE_CORRUPT;
}
}
return OK;
}