From c5dfe6824c6faf91121cfec14ca960c61c53259e Mon Sep 17 00:00:00 2001 From: Poommetee Ketson Date: Sun, 1 Apr 2018 22:06:47 +0700 Subject: [PATCH] Mesh: fix crash when creating mesh outline from QuadMesh Since create_outline can only make outline for PRIMITIVE_TRIANGLES, when QuadMesh (which is PRIMITIVE_TRIANGLE_FAN) is used to create outline, will leave `arrays` empty, and crash when it is being indexed for "indices" subarray. This PR shows error when there's only one surface and it is not TRIANGLES. Also prevent the crash if it has more than one surface and none of them are TRIANGLES (and any other cases that could leave `arrays` empty) by checking the size of `arrays` == 8 before indexing it, since the method seems to expect `arrays` to be of that size. (cherry picked from commit a492d229529018f0277f75aa7b99661b5dd40420) --- editor/plugins/mesh_instance_editor_plugin.cpp | 4 ++++ scene/resources/mesh.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index cb5f7ba76c8..7ea2b27744c 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -344,6 +344,10 @@ void MeshInstanceEditor::_create_outline_mesh() { err_dialog->set_text(TTR("Mesh has not surface to create outlines from!")); err_dialog->popup_centered_minsize(); return; + } else if (mesh->get_surface_count() == 1 && mesh->surface_get_primitive_type(0) != Mesh::PRIMITIVE_TRIANGLES) { + err_dialog->set_text(TTR("Mesh primitive type is not PRIMITIVE_TRIANGLES!")); + err_dialog->popup_centered_minsize(); + return; } Ref mesho = mesh->create_outline(outline_size->get_value()); diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 949ba12a4c7..b832ea12397 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -315,6 +315,8 @@ Ref Mesh::create_outline(float p_margin) const { } } + ERR_FAIL_COND_V(arrays.size() != ARRAY_MAX, Ref()); + { PoolVector::Write ir; PoolVector indices = arrays[ARRAY_INDEX];