diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-12 08:52:54 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-12 08:52:54 +0200 |
| commit | 15de5b0a2cfd2966d093a04a057501612a499ab0 (patch) | |
| tree | ac8f4076e12c8704f4266d8dcb7736c3a0603cb0 | |
| parent | 16edce0cc242831062e1e1630e33146a003280a9 (diff) | |
| parent | 84d706cb356f4f00bedfa0bff265968b439385c8 (diff) | |
Merge pull request #4289 from Zylann/issue4265_trackpad_option
Made trackpad behaviour optional in 3D mode (issue #4265)
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 31da68cb8c..06e92028c7 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -451,6 +451,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("3d_editor/zoom_modifier",4); hints["3d_editor/zoom_modifier"]=PropertyInfo(Variant::INT,"3d_editor/zoom_modifier",PROPERTY_HINT_ENUM,"None,Shift,Alt,Meta,Ctrl"); set("3d_editor/emulate_numpad",false); + set("3d_editor/trackpad_hint", false); set("2d_editor/bone_width",5); set("2d_editor/bone_color1",Color(1.0,1.0,1.0,0.9)); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 9ab7aafeb2..c4d3f7282e 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1579,7 +1579,8 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { if (m.mod.alt) nav_mode = NAVIGATION_PAN; } - }else{ + + } else if (EditorSettings::get_singleton()->get("3d_editor/trackpad_hint")) { // Handle trackpad (no external mouse) use case int mod = 0; if (m.mod.shift) |