From 8f6e8ef0d7b3ae91cd8719f05761cc35e1c9cd13 Mon Sep 17 00:00:00 2001 From: jsjtxietian Date: Mon, 6 Nov 2023 16:22:32 +0800 Subject: [PATCH] clean unnecessay copy detected by clang-tidy --- core/io/resource_saver.cpp | 5 ++--- editor/import/resource_importer_scene.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp index 564a54b913a..0462e24b9e3 100644 --- a/core/io/resource_saver.cpp +++ b/core/io/resource_saver.cpp @@ -120,9 +120,8 @@ Error ResourceSaver::save(const Ref &p_resource, const String &p_path, String local_path = ProjectSettings::get_singleton()->localize_path(path); - Ref rwcopy = p_resource; if (p_flags & FLAG_CHANGE_PATH) { - rwcopy->set_path(local_path); + p_resource->set_path(local_path); } err = saver[i]->save(p_resource, path, p_flags); @@ -139,7 +138,7 @@ Error ResourceSaver::save(const Ref &p_resource, const String &p_path, #endif if (p_flags & FLAG_CHANGE_PATH) { - rwcopy->set_path(old_path); + p_resource->set_path(old_path); } if (save_callback && path.begins_with("res://")) { diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 8e277a8b6c7..6fd91deab90 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -2369,9 +2369,8 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file, const HashM ERR_FAIL_COND_V(!importer.is_valid(), nullptr); Error err = OK; - HashMap options_dupe = p_options; - Node *scene = importer->import_scene(p_source_file, EditorSceneFormatImporter::IMPORT_ANIMATION | EditorSceneFormatImporter::IMPORT_GENERATE_TANGENT_ARRAYS | EditorSceneFormatImporter::IMPORT_FORCE_DISABLE_MESH_COMPRESSION, options_dupe, nullptr, &err); + Node *scene = importer->import_scene(p_source_file, EditorSceneFormatImporter::IMPORT_ANIMATION | EditorSceneFormatImporter::IMPORT_GENERATE_TANGENT_ARRAYS | EditorSceneFormatImporter::IMPORT_FORCE_DISABLE_MESH_COMPRESSION, p_options, nullptr, &err); if (!scene || err != OK) { return nullptr; }