diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-04 12:25:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 12:25:36 +0100 |
| commit | 0ff45dd3a7ff28b7fb686cb6e8640926f885038a (patch) | |
| tree | 525367bb4fdc1b804d16de6bef13b90281c2a0df /core | |
| parent | 7de48982fed1bcc60ae3f4a9a08d04b167b26356 (diff) | |
| parent | 4219485a827ff37dc25c72786c8786962e5b55f2 (diff) | |
Merge pull request #58673 from Calinou/smooth-trimesh-collision-always-setting
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/project_settings.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 3a7fc828aa..c9b615fb0a 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1240,6 +1240,9 @@ ProjectSettings::ProjectSettings() { custom_prop_info["rendering/driver/threads/thread_model"] = PropertyInfo(Variant::INT, "rendering/driver/threads/thread_model", PROPERTY_HINT_ENUM, "Single-Unsafe,Single-Safe,Multi-Threaded"); GLOBAL_DEF("physics/2d/run_on_separate_thread", false); GLOBAL_DEF("physics/3d/run_on_separate_thread", false); + // Required to make the project setting appear even if the physics engine is GodotPhysics, + // while also making it appear in the ProjectSettings class documentation. + GLOBAL_DEF("physics/3d/smooth_trimesh_collision", false); GLOBAL_DEF("debug/settings/profiler/max_functions", 16384); custom_prop_info["debug/settings/profiler/max_functions"] = PropertyInfo(Variant::INT, "debug/settings/profiler/max_functions", PROPERTY_HINT_RANGE, "128,65535,1"); |