diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-09 11:30:06 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-01-09 11:30:06 +0100 |
| commit | 2ccc5c75758f9db41858b28edd4e968693db7e8a (patch) | |
| tree | ba0dc51ece69591fba157c521c8b6b4fffd9a5b1 /editor/editor_node.cpp | |
| parent | 6f118b8c4af543f40206871deb63e873291ef326 (diff) | |
| parent | 9ca3d3ec835e12ec686b58bdc2c797c686503e3b (diff) | |
| download | redot-engine-2ccc5c75758f9db41858b28edd4e968693db7e8a.tar.gz | |
Merge pull request #86990 from akien-mga/revert-84167-cache_mode_replace_fixes
Revert "Fix behavior of ResourceFormatLoader `CACHE_MODE_REPLACE`"
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 3eb40b1931..549f62276d 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6170,7 +6170,8 @@ void EditorNode::reload_instances_with_path_in_edited_scenes(const String &p_ins if (edited_scene_map.size() > 0) { // Reload the new instance. Error err; - Ref<PackedScene> instance_scene_packed_scene = ResourceLoader::load(p_instance_path, "", ResourceFormatLoader::CACHE_MODE_REPLACE, &err); + Ref<PackedScene> instance_scene_packed_scene = ResourceLoader::load(p_instance_path, "", ResourceFormatLoader::CACHE_MODE_IGNORE, &err); + instance_scene_packed_scene->set_path(p_instance_path, true); ERR_FAIL_COND(err != OK); ERR_FAIL_COND(instance_scene_packed_scene.is_null()); @@ -6277,7 +6278,8 @@ void EditorNode::reload_instances_with_path_in_edited_scenes(const String &p_ins // be properly updated. for (String path : required_load_paths) { if (!local_scene_cache.find(path)) { - current_packed_scene = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_REPLACE, &err); + current_packed_scene = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_IGNORE, &err); + current_packed_scene->set_path(path, true); local_scene_cache[path] = current_packed_scene; } else { current_packed_scene = local_scene_cache[path]; |