1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104384 from Hilderin/fix-crash-reimport-nested-gltf-scene

Browse Source 
Fix crash when reimporting nested gltf scenes
This commit is contained in:
Rémi Verschelde 2025-03-20 17:28:36 +01:00 committed by GitHub
commit 03359c8735
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/editor_node.cpp
View File

@ -6457,6 +6457,18 @@ void EditorNode::reload_instances_with_path_in_edited_scenes() {
get_scene_editor_data_for_node(owner, original_node, scene_editor_data_table);
// The current node being reloaded may also be an additional node for another node
// that is in the process of being reloaded.
// Replacing the additional node with the new one prevents a crash where nodes
// in 'addition_list' are removed from the scene tree and queued for deletion.
for (InstanceModificationsEntry &im : scene_modifications->instance_list) {
for (AdditiveNodeEntry &additive_node_entry : im.addition_list) {
if (additive_node_entry.node == original_node) {
additive_node_entry.node = instantiated_node;
}
}
}
bool original_node_scene_instance_load_placeholder = original_node->get_scene_instance_load_placeholder();
// Delete all the remaining node children.