From d70e80ee78439fd3908985ac483c246fc2746250 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Thu, 4 Aug 2022 13:06:17 +0200 Subject: [PATCH] Fix some array size function definition mismatch. (cherry picked from commit 55845bac260628788fde2ea431ecaad3ff26d1bc) --- 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 68dd49006f4..aaffebb45fb 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1022,7 +1022,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[(size_t)HAT_MAX]) { for (int i = 0; i < mapping.bindings.size(); i++) { const JoyBinding binding = mapping.bindings[i]; diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index b34cfbfaab9..f7cfd1251cf 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -726,7 +726,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++) {