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

[4.2] Fix crash when previewing a scene with a mesh as the root node 

(cherry picked from commit 424a6a6bf5)
This commit is contained in:
Aaron Franke 2024-01-31 06:38:25 -06:00 committed by Rémi Verschelde
parent 611c435dab
commit 7c02f5cd5c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/import/scene_import_settings.cpp
View File

@ -310,7 +310,10 @@ void SceneImportSettings::_fill_scene(Node *p_node, TreeItem *p_parent_item) {
Ref<ImporterMesh> editor_mesh = src_mesh_node->get_mesh(); Ref<ImporterMesh> editor_mesh = src_mesh_node->get_mesh();
mesh_node->set_mesh(editor_mesh->get_mesh()); mesh_node->set_mesh(editor_mesh->get_mesh());
} }
// Replace the original mesh node in the scene tree with the new one.
if (unlikely(p_node == scene)) {
scene = mesh_node;
}
p_node->replace_by(mesh_node); p_node->replace_by(mesh_node);
memdelete(p_node); memdelete(p_node);
p_node = mesh_node; p_node = mesh_node;