asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #87781 from aaronfranke/fix-crash-mesh-root

Browse source 
Fix crash when previewing a scene with a mesh as the root node
This commit is contained in:
Rémi Verschelde 2024-02-07 10:58:52 +01:00
commit bc9acde764
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/3d/scene_import_settings.cpp
View file

@ -311,7 +311,10 @@ void SceneImportSettingsDialog::_fill_scene(Node *p_node, TreeItem *p_parent_ite
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;