diff options
| author | Thomas Herzog <karroffel@users.noreply.github.com> | 2017-07-10 22:13:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-10 22:13:46 +0200 |
| commit | f345fbe4d380f840198bfc7de4a33902bec69083 (patch) | |
| tree | 6f80fe1a1f0ded5f13434353b10810aff2f6159f /scene | |
| parent | 159b1fc65f650df0428dbfa9d14e3fd0bcfb94d0 (diff) | |
| parent | c061044d7875f1c7a717fddbf03cab5a822e7d35 (diff) | |
Merge pull request #9594 from RandomShaper/fix-mouse-capture
Fix picking list flood while mouse capture enabled
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 3a9968d126..4fb4e02148 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2352,7 +2352,7 @@ void Viewport::unhandled_input(const Ref<InputEvent> &p_event) { if (physics_object_picking && !get_tree()->input_handled) { - if (p_event->cast_to<InputEventMouseButton>() || p_event->cast_to<InputEventMouseMotion>() || p_event->cast_to<InputEventScreenDrag>() || p_event->cast_to<InputEventScreenTouch>()) { + if (Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED && (p_event->cast_to<InputEventMouseButton>() || p_event->cast_to<InputEventMouseMotion>() || p_event->cast_to<InputEventScreenDrag>() || p_event->cast_to<InputEventScreenTouch>())) { physics_picking_events.push_back(p_event); } } |