Merge pull request #11463 from kubecz3k/mouse-orbit-modifier

rotation orbit modifier defaults to none

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-09-21 18:06:16 +02:00 committed by GitHub
commit d7468fea5b

View file

@ -672,7 +672,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
hints["editors/3d/navigation/zoom_style"] = PropertyInfo(Variant::INT, "editors/3d/navigation/zoom_style", PROPERTY_HINT_ENUM, "Vertical, Horizontal");
set("editors/3d/navigation/emulate_3_button_mouse", false);
set("editors/3d/navigation/orbit_modifier", 3);
set("editors/3d/navigation/orbit_modifier", 0);
hints["editors/3d/navigation/orbit_modifier"] = PropertyInfo(Variant::INT, "editors/3d/navigation/orbit_modifier", PROPERTY_HINT_ENUM, "None,Shift,Alt,Meta,Ctrl");
set("editors/3d/navigation/pan_modifier", 1);
hints["editors/3d/navigation/pan_modifier"] = PropertyInfo(Variant::INT, "editors/3d/navigation/pan_modifier", PROPERTY_HINT_ENUM, "None,Shift,Alt,Meta,Ctrl");