Skip to content

Commit f9eb98d

Browse files
committed
Merge pull request #112337 from Rindbee/do-not-assign-a-uid-for-keep-or-skip-importer
Don't assign a uid when copying resource file whose `importer` name is `keep` or `skip`
2 parents f2f5437 + aed8f32 commit f9eb98d

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

editor/file_system/editor_file_system.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3085,13 +3085,19 @@ Error EditorFileSystem::_copy_file(const String &p_from, const String &p_to) {
30853085
return err;
30863086
}
30873087

3088-
// Roll a new uid for this copied .import file to avoid conflict.
3089-
ResourceUID::ID res_uid = ResourceUID::get_singleton()->create_id_for_path(p_to);
3090-
30913088
// Save the new .import file
30923089
Ref<ConfigFile> cfg;
30933090
cfg.instantiate();
30943091
cfg->load(p_from + ".import");
3092+
String importer_name = cfg->get_value("remap", "importer");
3093+
3094+
if (importer_name == "keep" || importer_name == "skip") {
3095+
err = da->copy(p_from + ".import", p_to + ".import");
3096+
return err;
3097+
}
3098+
3099+
// Roll a new uid for this copied .import file to avoid conflict.
3100+
ResourceUID::ID res_uid = ResourceUID::get_singleton()->create_id_for_path(p_to);
30953101
cfg->set_value("remap", "uid", ResourceUID::get_singleton()->id_to_text(res_uid));
30963102
err = cfg->save(p_to + ".import");
30973103
if (err != OK) {

0 commit comments

Comments
 (0)