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

Fixes the support of the 'keep on reimport' flag - Issue #20878.

Browse Source
This commit is contained in:
Guillaume Laforte 2018-12-11 08:56:36 -05:00
parent 6343d05d9b
commit d09ccf6f81
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/import/resource_importer_scene.cpp
View File

@ -972,7 +972,7 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String
} else { } else {
ResourceSaver::save(ext_name, mat, ResourceSaver::FLAG_CHANGE_PATH); ResourceSaver::save(ext_name, mat, ResourceSaver::FLAG_CHANGE_PATH);
p_materials[mat] = ResourceLoader::load(ext_name); p_materials[mat] = ResourceLoader::load(ext_name, "", true); // disable loading from the cache.
} }
} }
@ -1018,13 +1018,13 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String
String ext_name = p_base_path.plus_file(_make_extname(mat->get_name()) + ".material"); String ext_name = p_base_path.plus_file(_make_extname(mat->get_name()) + ".material");
; ;
if (FileAccess::exists(ext_name)) { if (p_keep_materials && FileAccess::exists(ext_name)) {
//if exists, use it //if exists, use it
p_materials[mat] = ResourceLoader::load(ext_name); p_materials[mat] = ResourceLoader::load(ext_name);
} else { } else {
ResourceSaver::save(ext_name, mat, ResourceSaver::FLAG_CHANGE_PATH); ResourceSaver::save(ext_name, mat, ResourceSaver::FLAG_CHANGE_PATH);
p_materials[mat] = ResourceLoader::load(ext_name); p_materials[mat] = ResourceLoader::load(ext_name, "", true); // disable loading from the cache.
} }
} }