diff options
| author | sunnystormy <michael.brodeur@unseen.is> | 2016-06-21 06:16:06 -0400 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-06-21 12:16:06 +0200 |
| commit | b3b1fdae85f845d92d749ec268877b87bb9bc47a (patch) | |
| tree | 32275ff9169d978fc2fd34cf66c645e01d593d32 /tools | |
| parent | 029ca80dca135df3dcbbea517032d6842f2efc87 (diff) | |
Renamed Trackpad Hint to Emulate 3 Button Mouse. (#5258)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 0fffaca782..49a1158ec6 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -583,7 +583,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("3d_editor/emulate_3_button_mouse", 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 fdb654571a..8d72178f23 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1580,7 +1580,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { nav_mode = NAVIGATION_PAN; } - } else if (EditorSettings::get_singleton()->get("3d_editor/trackpad_hint")) { + } else if (EditorSettings::get_singleton()->get("3d_editor/emulate_3_button_mouse")) { // Handle trackpad (no external mouse) use case int mod = 0; if (m.mod.shift) |