summaryrefslogtreecommitdiff
path: root/modules/csg
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-05-20 07:57:10 +0200
committerGitHub <noreply@github.com>2022-05-20 07:57:10 +0200
commit03218889d037cb2a807ae8565dbfe3c0a86fdf4f (patch)
treefe1935f189e22c7231599abccdde6d3c916fb5fa /modules/csg
parent277ea1950a84c80163ef67a4ff8f521be946ed8c (diff)
parentde93286b1defaae24bfeb52e4d1eb4d75e36392a (diff)
Merge pull request #61213 from timothyqiu/csg-crash
Fix editor crash when opening scene with CSGMesh
Diffstat (limited to 'modules/csg')
-rw-r--r--modules/csg/editor/csg_gizmos.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp
index 4d972e46c6..6442ff71fc 100644
--- a/modules/csg/editor/csg_gizmos.cpp
+++ b/modules/csg/editor/csg_gizmos.cpp
@@ -349,9 +349,11 @@ void CSGShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
if (cs->is_root_shape()) {
Array csg_meshes = cs->get_meshes();
- Ref<Mesh> csg_mesh = csg_meshes[1];
- if (csg_mesh.is_valid()) {
- p_gizmo->add_collision_triangles(csg_mesh->generate_triangle_mesh());
+ if (csg_meshes.size() == 2) {
+ Ref<Mesh> csg_mesh = csg_meshes[1];
+ if (csg_mesh.is_valid()) {
+ p_gizmo->add_collision_triangles(csg_mesh->generate_triangle_mesh());
+ }
}
}