diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-23 00:00:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 00:00:36 +0100 |
| commit | 725552af69824aac1e49c41f509d0cfed0984561 (patch) | |
| tree | 52552085ec4f57e009231d341fe15870e657eed0 | |
| parent | e0f19287f70ddc1b0fe1db908203d98690d040ab (diff) | |
| parent | 6c9259ff2f25942d443cff70750fe48daf0f7b7a (diff) | |
Merge pull request #47255 from Calinou/fix-windows-tablet-setting-name
Fix feature tag casing in the Windows pen tablet project setting name
| -rw-r--r-- | doc/classes/ProjectSettings.xml | 2 | ||||
| -rw-r--r-- | main/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index d7ccb03d04..5b9150ab04 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -734,7 +734,7 @@ <member name="input_devices/pen_tablet/driver" type="String" setter="" getter=""> Specifies the tablet driver to use. If left empty, the default driver will be used. </member> - <member name="input_devices/pen_tablet/driver.windows" type="String" setter="" getter=""> + <member name="input_devices/pen_tablet/driver.Windows" type="String" setter="" getter=""> Override for [member input_devices/pen_tablet/driver] on Windows. </member> <member name="input_devices/pointing/emulate_mouse_from_touch" type="bool" setter="" getter="" default="true"> diff --git a/main/main.cpp b/main/main.cpp index 951fce35ba..aa925c508c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1551,8 +1551,8 @@ Error Main::setup2(Thread::ID p_main_tid_override) { { GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver", ""); - GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver.windows", ""); - ProjectSettings::get_singleton()->set_custom_property_info("input_devices/pen_tablet/driver.windows", PropertyInfo(Variant::STRING, "input_devices/pen_tablet/driver.windows", PROPERTY_HINT_ENUM, "wintab,winink")); + GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver.Windows", ""); + ProjectSettings::get_singleton()->set_custom_property_info("input_devices/pen_tablet/driver.Windows", PropertyInfo(Variant::STRING, "input_devices/pen_tablet/driver.Windows", PROPERTY_HINT_ENUM, "wintab,winink")); } if (tablet_driver == "") { // specified in project.godot |