diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2016-10-29 22:29:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-29 22:29:18 +0200 |
| commit | 33766a493542492507e9c7eda2118914852d61e9 (patch) | |
| tree | 50cb688517e2853a4ff2e46c3e01ea6b677a39cc /core | |
| parent | a52cbd65a8cc512c0292daedac59c3d7f1900286 (diff) | |
| parent | b76a0ca40c02a29692ca124dd1d28a3cecc6c3fb (diff) | |
Merge pull request #6901 from volzhs/fix-inputevent-compare
Fix comparison bug with InputEvent
Diffstat (limited to 'core')
| -rw-r--r-- | core/os/input_event.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index 9982767be1..7350be824a 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -50,7 +50,8 @@ bool InputEvent::operator==(const InputEvent &p_event) const { case MOUSE_MOTION: return mouse_motion.x == p_event.mouse_motion.x && mouse_motion.y == p_event.mouse_motion.y - && mouse_motion.relative_x == p_event.mouse_motion.relative_y + && mouse_motion.relative_x == p_event.mouse_motion.relative_x + && mouse_motion.relative_y == p_event.mouse_motion.relative_y && mouse_motion.button_mask == p_event.mouse_motion.button_mask && key.mod == p_event.key.mod; case MOUSE_BUTTON: |