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

Merge pull request #80149 from aaronfranke/fix-res-reimport-empty-scene 

Fix error message when reimporting resources with an empty scene open
This commit is contained in:
Rémi Verschelde 2023-09-04 09:07:48 +02:00
parent 92da5a7654 ff911c3ad3
commit a0d21d41a8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/import_dock.cpp
View File

@ -543,8 +543,11 @@ void ImportDock::_reimport_and_cleanup() {
Ref<Resource> old_res = old_resources[path];
Ref<Resource> new_res = ResourceLoader::load(path);
for (int j = 0; j < EditorNode::get_editor_data().get_edited_scene_count(); j++) {
_replace_resource_in_object(EditorNode::get_editor_data().get_edited_scene_root(j), old_res, new_res);
for (int i = 0; i < EditorNode::get_editor_data().get_edited_scene_count(); i++) {
Node *edited_scene_root = EditorNode::get_editor_data().get_edited_scene_root(i);
if (likely(edited_scene_root)) {
_replace_resource_in_object(edited_scene_root, old_res, new_res);
}
}
for (Ref<Resource> res : external_resources) {
_replace_resource_in_object(res.ptr(), old_res, new_res);