diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-02-16 07:50:51 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-02-16 07:50:51 +0100 |
| commit | 7496fd4788a2aced44188f3c113eb15994fda4c0 (patch) | |
| tree | 213b4e1dfa935bec45f8f751dc303fa0b2b5297a /tools/editor/editor_settings.cpp | |
| parent | 658153a08807d1461dc7d50157399c252a2e4d1c (diff) | |
| parent | 67a839c79110221c3350392317fafa66a1b0c5f4 (diff) | |
Merge pull request #3689 from nunodonato/numpademulation
* Added numpad emulation in the 3d viewport (fixes #3612)
Diffstat (limited to 'tools/editor/editor_settings.cpp')
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 4195ba97e6..e8b40bdcf3 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -490,6 +490,7 @@ void EditorSettings::_load_defaults() { hints["3d_editor/pan_modifier"]=PropertyInfo(Variant::INT,"3d_editor/pan_modifier",PROPERTY_HINT_ENUM,"None,Shift,Alt,Meta,Ctrl"); 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("2d_editor/bone_width",5); set("2d_editor/bone_color1",Color(1.0,1.0,1.0,0.9)); |