From 7e89dc432c8781114f4855d6d2f24675a5a1ce5f Mon Sep 17 00:00:00 2001 From: Gilles Roudiere Date: Wed, 18 Apr 2018 21:38:52 +0200 Subject: Fixes left/up axis not mappable as actions --- editor/project_settings_editor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editor/project_settings_editor.cpp') diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 8ae573baef..3127644a81 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -234,6 +234,7 @@ void ProjectSettingsEditor::_device_input_add() { Ref jm; jm.instance(); jm->set_axis(device_index->get_selected() >> 1); + jm->set_axis_value(device_index->get_selected() & 1 ? 1 : -1); jm->set_device(_get_current_device()); bool should_update_event = true; @@ -243,7 +244,7 @@ void ProjectSettingsEditor::_device_input_add() { Ref aie = events[i]; if (aie.is_null()) continue; - if (aie->get_device() == jm->get_device() && aie->get_axis() == jm->get_axis()) { + if (aie->get_device() == jm->get_device() && aie->get_axis() == jm->get_axis() && aie->get_axis_value() == jm->get_axis_value()) { should_update_event = false; break; } -- cgit v1.2.3