diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-11-08 02:10:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-08 02:10:35 +0100 |
| commit | 2f0d3d5424c393c756f4cd5cac26287c95aaf4fe (patch) | |
| tree | ad7a7fa1d33b3e46c7f79c9b4016f51d53c67a76 /servers/physics_2d | |
| parent | b61fda9d2a6166e41538405ad8ae24f1aed40570 (diff) | |
| parent | d9f066d5fadfce5fc19310f8ba5ce51d3552bf9e (diff) | |
Merge pull request #61549 from KoBeWi/project_settings_mess
Remove duplicate project settings definitions
Diffstat (limited to 'servers/physics_2d')
| -rw-r--r-- | servers/physics_2d/godot_space_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_2d/godot_space_2d.cpp b/servers/physics_2d/godot_space_2d.cpp index a82d7dbbc4..89afb0e2a0 100644 --- a/servers/physics_2d/godot_space_2d.cpp +++ b/servers/physics_2d/godot_space_2d.cpp @@ -1225,7 +1225,7 @@ GodotSpace2D::GodotSpace2D() { ProjectSettings::get_singleton()->set_custom_property_info("physics/2d/solver/solver_iterations", PropertyInfo(Variant::INT, "physics/2d/solver/solver_iterations", PROPERTY_HINT_RANGE, "1,32,1,or_greater")); contact_recycle_radius = GLOBAL_DEF("physics/2d/solver/contact_recycle_radius", 1.0); - ProjectSettings::get_singleton()->set_custom_property_info("physics/2d/solver/contact_recycle_radius", PropertyInfo(Variant::FLOAT, "physics/2d/solver/contact_max_separation", PROPERTY_HINT_RANGE, "0,10,0.01,or_greater")); + ProjectSettings::get_singleton()->set_custom_property_info("physics/2d/solver/contact_recycle_radius", PropertyInfo(Variant::FLOAT, "physics/2d/solver/contact_recycle_radius", PROPERTY_HINT_RANGE, "0,10,0.01,or_greater")); contact_max_separation = GLOBAL_DEF("physics/2d/solver/contact_max_separation", 1.5); ProjectSettings::get_singleton()->set_custom_property_info("physics/2d/solver/contact_max_separation", PropertyInfo(Variant::FLOAT, "physics/2d/solver/contact_max_separation", PROPERTY_HINT_RANGE, "0,10,0.01,or_greater")); |