From ab9f61e6cc3d1eb884436a324a5632460235261b Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Mon, 19 Jun 2023 15:28:05 +1200 Subject: [PATCH] Fix methods with array parameters with mismatched bounds --- main/input_default.cpp | 2 +- modules/csg/csg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/input_default.cpp b/main/input_default.cpp index 5e518e2917..16514f56f1 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1059,7 +1059,7 @@ InputDefault::JoyEvent InputDefault::_get_mapped_axis_event(const JoyDeviceMappi return event; } -void InputDefault::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, JoyEvent r_events[]) { +void InputDefault::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, JoyEvent r_events[HAT_MAX]) { for (int i = 0; i < mapping.bindings.size(); i++) { const JoyBinding binding = mapping.bindings[i]; if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) { diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index 25ae92eb04..25cbd27322 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -729,7 +729,7 @@ void CSGBrushOperation::MeshMerge::mark_inside_faces() { } } -void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[], const Vector2 p_uvs[], bool p_smooth, bool p_invert, const Ref &p_material, bool p_from_b) { +void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[3], const Vector2 p_uvs[3], bool p_smooth, bool p_invert, const Ref &p_material, bool p_from_b) { int indices[3]; for (int i = 0; i < 3; i++) { VertexKey vk;