Browse Source

Fix some array size function definition mismatch.

(cherry picked from commit 55845bac260628788fde2ea431ecaad3ff26d1bc)
Fabio Alessandrelli 3 years ago
parent
commit
eb36a16b36
2 changed files with 2 additions and 2 deletions
  1. 1 1
      main/input_default.cpp
  2. 1 1
      modules/csg/csg.cpp

+ 1 - 1
main/input_default.cpp

@@ -1037,7 +1037,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];

+ 1 - 1
modules/csg/csg.cpp

@@ -734,7 +734,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<Material> &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<Material> &p_material, bool p_from_b) {
 
 	int indices[3];
 	for (int i = 0; i < 3; i++) {