summaryrefslogtreecommitdiff
path: root/editor/import
diff options
context:
space:
mode:
authorRishabh Abhani <rishabhabhani@gmail.com>2021-03-26 11:49:06 +0530
committerRishabh Abhani <rishabhabhani@gmail.com>2021-03-26 11:49:06 +0530
commit435c80490a8361168ce14bf0c37a8dec31706f89 (patch)
treee04a60917ce77e49da8a5978944db3a900beef66 /editor/import
parentc6b9ceadf2d2c220acdb4081e488c13de9d5f52c (diff)
added null checks for mesh in resource importer
Diffstat (limited to 'editor/import')
-rw-r--r--editor/import/resource_importer_scene.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index 3abdc5a328..9041b815ca 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -234,6 +234,7 @@ static String _fixstr(const String &p_what, const String &p_str) {
}
static void _gen_shape_list(const Ref<Mesh> &mesh, List<Ref<Shape3D>> &r_shape_list, bool p_convex) {
+ ERR_FAIL_NULL_MSG(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);
@@ -248,6 +249,7 @@ static void _gen_shape_list(const Ref<Mesh> &mesh, List<Ref<Shape3D>> &r_shape_l
}
static void _pre_gen_shape_list(const Ref<EditorSceneImporterMesh> &mesh, List<Ref<Shape3D>> &r_shape_list, bool p_convex) {
+ ERR_FAIL_NULL_MSG(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);