diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-12 08:50:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 08:50:19 +0200 |
| commit | b27683111b95495daf2cf2a39de3ef56fd57bf20 (patch) | |
| tree | 3adf290f437030e2c6e107fb33f07d060e85ad8c /core | |
| parent | 514c8d586a21e2703deff17f7fcdf821809dc78d (diff) | |
| parent | 74ab336fe349fc1a82785bcbfc22ad8c82c0e931 (diff) | |
| download | redot-engine-b27683111b95495daf2cf2a39de3ef56fd57bf20.tar.gz | |
Merge pull request #50385 from Geometror/vsyncmode-int-enum
Change VSync mode project setting enum type from string to integer
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/project_settings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 29f53482fa..ac4e0db5b7 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1114,7 +1114,8 @@ ProjectSettings::ProjectSettings() { // Keep the enum values in sync with the `DisplayServer::ScreenOrientation` enum. custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::INT, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "Landscape,Portrait,Reverse Landscape,Reverse Portrait,Sensor Landscape,Sensor Portrait,Sensor"); - custom_prop_info["display/window/vsync/vsync_mode"] = PropertyInfo(Variant::STRING, "display/window/vsync/vsync_mode", PROPERTY_HINT_ENUM, "Disabled,Enabled,Adaptive,Mailbox"); + // Keep the enum values in sync with the `DisplayServer::VSyncMode` enum. + custom_prop_info["display/window/vsync/vsync_mode"] = PropertyInfo(Variant::INT, "display/window/vsync/vsync_mode", PROPERTY_HINT_ENUM, "Disabled,Enabled,Adaptive,Mailbox"); 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_thread", false); GLOBAL_DEF("physics/3d/run_on_thread", false); |