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

Merge pull request #70630 from asmaloney/importer-crash-null-mesh-node

Browse Source 
Fix crash in SceneImportSettings::_select when a mesh has a null mesh node
This commit is contained in:
Rémi Verschelde 2023-01-17 15:00:01 +01:00
commit ee7beff3c4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/import/scene_import_settings.cpp
View File

@ -703,15 +703,17 @@ void SceneImportSettings::_select(Tree *p_from, String p_type, String p_id) {
} }
MeshData &md = mesh_map[p_id]; MeshData &md = mesh_map[p_id];
if (p_from != mesh_tree) { if (md.mesh_node != nullptr) {
md.mesh_node->uncollapse_tree(); if (p_from != mesh_tree) {
md.mesh_node->select(0); md.mesh_node->uncollapse_tree();
mesh_tree->ensure_cursor_is_visible(); md.mesh_node->select(0);
} mesh_tree->ensure_cursor_is_visible();
if (p_from != scene_tree) { }
md.scene_node->uncollapse_tree(); if (p_from != scene_tree) {
md.scene_node->select(0); md.scene_node->uncollapse_tree();
scene_tree->ensure_cursor_is_visible(); md.scene_node->select(0);
scene_tree->ensure_cursor_is_visible();
}
} }
mesh_preview->set_mesh(md.mesh); mesh_preview->set_mesh(md.mesh);