diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-02 11:17:01 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-02 11:17:01 -0300 |
| commit | 064fd762fae75371658e773a3acf39616e813b08 (patch) | |
| tree | 688906f77ecc648e6bd4488afebff6b32db97d9c /scene | |
| parent | 4b1f0afb014cae7c9a84c8d7c0429f45f425214b (diff) | |
| parent | ce5216042987b3cb19c19ec19f16aabf545c672f (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 3b0425b223..552d8789a6 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -719,7 +719,7 @@ void RichTextLabel::_input_event(InputEvent p_event) { case InputEvent::KEY: { const InputEventKey &k=p_event.key; - if (k.pressed && !k.mod.alt && !k.mod.shift && !k.mod.command && !k.mod.meta) { + if (k.pressed && !k.mod.alt && !k.mod.shift && !k.mod.meta) { bool handled=true; switch(k.scancode) { case KEY_PAGEUP: { |