diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 23:38:10 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-04 23:38:10 -0300 |
| commit | cb93e064a9378af3b8a31cae43aa55f3cd4168f2 (patch) | |
| tree | b0f830b9682bb585b055e38ed902d963e2e9cfea /scene/gui/text_edit.cpp | |
| parent | 68700ee3a98298709371c5b970c3083ef534faac (diff) | |
| parent | dce8a6c251d4da24d70cab6033753895716bc998 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/gui/text_edit.cpp')
| -rw-r--r-- | scene/gui/text_edit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 6cdff20aaf..75174a85de 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -489,7 +489,7 @@ void TextEdit::_notification(int p_what) { CharType cc = text[i][j]; //ignore any brackets inside a string - if (cc== '"' | cc == '\'') { + if (cc== '"' || cc == '\'') { CharType quotation = cc; do { j++; @@ -560,7 +560,7 @@ void TextEdit::_notification(int p_what) { CharType cc = text[i][j]; //ignore any brackets inside a string - if (cc== '"' | cc == '\'') { + if (cc== '"' || cc == '\'') { CharType quotation = cc; do { j--; |