Merge commit godotengine/godot@75ce4266c4

modules/godot_physics_2d/godot_body_2d.cpp

@@ -34,6 +34,7 @@
 
 #include "godot_area_2d.h"
 #include "godot_body_direct_state_2d.h"
+#include "godot_constraint_2d.h"
 #include "godot_space_2d.h"
 
 void GodotBody2D::_mass_properties_changed() {

modules/godot_physics_2d/godot_body_direct_state_2d.cpp

@@ -33,7 +33,6 @@
 #include "godot_body_direct_state_2d.h"
 
 #include "godot_body_2d.h"
-#include "godot_physics_server_2d.h"
 #include "godot_space_2d.h"
 
 Vector2 GodotPhysicsDirectBodyState2D::get_total_gravity() const {

modules/godot_physics_2d/godot_space_2d.cpp

@@ -35,8 +35,9 @@
 #include "godot_collision_solver_2d.h"
 #include "godot_physics_server_2d.h"
 
-#include "core/os/os.h"
-#include "core/templates/pair.h"
+#include "core/config/project_settings.h"
+#include "godot_area_pair_2d.h"
+#include "godot_body_pair_2d.h"
 
 #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001
 #define TEST_MOTION_MIN_CONTACT_DEPTH_FACTOR 0.05

modules/godot_physics_2d/godot_space_2d.h

@@ -34,14 +34,10 @@
 #define GODOT_SPACE_2D_H
 
 #include "godot_area_2d.h"
-#include "godot_area_pair_2d.h"
 #include "godot_body_2d.h"
-#include "godot_body_pair_2d.h"
 #include "godot_broad_phase_2d.h"
 #include "godot_collision_object_2d.h"
 
-#include "core/config/project_settings.h"
-#include "core/templates/hash_map.h"
 #include "core/typedefs.h"
 
 class GodotPhysicsDirectSpaceState2D : public PhysicsDirectSpaceState2D {

modules/godot_physics_2d/godot_step_2d.cpp

@@ -34,6 +34,7 @@
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
+#include "godot_constraint_2d.h"
 
 #define BODY_ISLAND_COUNT_RESERVE 128
 #define BODY_ISLAND_SIZE_RESERVE 512

modules/godot_physics_2d/register_types.cpp

@@ -32,6 +32,7 @@
 
 #include "register_types.h"
 
+#include "core/config/project_settings.h"
 #include "godot_physics_server_2d.h"
 #include "servers/physics_server_2d.h"
 #include "servers/physics_server_2d_wrap_mt.h"