diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-27 22:25:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-27 22:25:25 +0200 |
| commit | 157cba39331c5ca945c8c3bb2173c5363550a680 (patch) | |
| tree | aa2d442f3a750a2e98c534255619ae4e0aa23e68 /editor | |
| parent | 3e26ad3a5f15f88cd9844f81504b7346dd8aa588 (diff) | |
| parent | d905d3c3d3403423b9a82cf8dee86456578d934d (diff) | |
Merge pull request #54321 from V-Sekai/import-scene-crash
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/import/resource_importer_scene.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index bebf05d481..9cb69357bd 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -342,6 +342,7 @@ static String _fixstr(const String &p_what, const String &p_str) { static void _pre_gen_shape_list(Ref<ImporterMesh> &mesh, Vector<Ref<Shape3D>> &r_shape_list, bool p_convex) { ERR_FAIL_NULL_MSG(mesh, "Cannot generate shape list with null mesh value"); + ERR_FAIL_NULL_MSG(mesh->get_mesh(), "Cannot generate shape list with null mesh value"); if (!p_convex) { Ref<Shape3D> shape = mesh->create_trimesh_shape(); r_shape_list.push_back(shape); |