diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-08-02 19:11:47 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-08-02 19:11:47 -0300 |
commit | 3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49 (patch) | |
tree | aa2c814b744ab970ae79931b419908ff7ebc850e /scene/gui/line_edit.cpp | |
parent | ad313097ebcb2a0c02c956fdf74a6610c3f7c9a8 (diff) | |
parent | cea949180688add09eb9e69f5e405f361dc96d40 (diff) |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/gui/line_edit.cpp')
-rw-r--r-- | scene/gui/line_edit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 89c235e101..fcea12fd6b 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -468,7 +468,7 @@ void LineEdit::_input_event(InputEvent p_event) { if (handled) { accept_event(); - } else { + } else if (!k.mod.alt && !k.mod.command) { if (k.unicode>=32 && k.scancode!=KEY_DELETE) { if (editable) { |