summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-03-06 13:55:01 -0300
committerGitHub <noreply@github.com>2019-03-06 13:55:01 -0300
commit34a29cb0de1b34d46e2742bd1ea0a3613967e4ed (patch)
tree377bdac99e710f368b4a645b39ad20a993818172 /main
parent05ed316114e25333552902f85488c3e60a933a59 (diff)
parent82902656ac6c60c40979e9cb513b65d96119f917 (diff)
Merge pull request #26669 from RandomShaper/fix-26460
Improve/fix picking
Diffstat (limited to 'main')
-rw-r--r--main/input_default.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index e8133f9eba..65910b34bc 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -355,6 +355,7 @@ void InputDefault::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool
Ref<InputEventMouseButton> button_event;
button_event.instance();
+ button_event->set_device(-1);
button_event->set_position(st->get_position());
button_event->set_global_position(st->get_position());
button_event->set_pressed(st->is_pressed());
@@ -383,6 +384,7 @@ void InputDefault::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool
Ref<InputEventMouseMotion> motion_event;
motion_event.instance();
+ motion_event->set_device(-1);
motion_event->set_position(sd->get_position());
motion_event->set_global_position(sd->get_position());
motion_event->set_relative(sd->get_relative());
@@ -600,6 +602,7 @@ void InputDefault::ensure_touch_mouse_raised() {
Ref<InputEventMouseButton> button_event;
button_event.instance();
+ button_event->set_device(-1);
button_event->set_position(mouse_pos);
button_event->set_global_position(mouse_pos);
button_event->set_pressed(false);