godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21540 from YeldhamDev/image_reimp_error_fix 

Fix error when reimporting an Image resource
This commit is contained in:
Rémi Verschelde 2018-09-13 14:09:39 +02:00 committed by GitHub
parent 9b31d2da1c dff7366c86
commit bcc50de2d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/editor_file_system.cpp
View File

@ -1479,12 +1479,16 @@ void EditorFileSystem::_reimport_file(const String &p_file) {
cf.instance();
Error err = cf->load(p_file + ".import");
if (err == OK) {
List<String> sk;
cf->get_section_keys("params", &sk);
for (List<String>::Element *E = sk.front(); E; E = E->next()) {
params[E->get()] = cf->get_value("params", E->get());
if (cf->has_section("params")) {
List<String> sk;
cf->get_section_keys("params", &sk);
for (List<String>::Element *E = sk.front(); E; E = E->next()) {
params[E->get()] = cf->get_value("params", E->get());
}
}
if (cf->has_section("remap")) {
importer_name = cf->get_value("remap", "importer");
}
importer_name = cf->get_value("remap", "importer");
}
} else {