summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-05-01 09:31:29 +0200
committerGitHub <noreply@github.com>2018-05-01 09:31:29 +0200
commit204de5e6dc143a0fa543d7017919d57e51bdf0f0 (patch)
tree800151995cad6f1d0127b8c16add50a060c07863
parente1ef2f538f888438645ebd65c95fa4142a86927c (diff)
parentf48ff4dc64ac05900eb3e7a5c10b9c9d2f5e4bad (diff)
Merge pull request #18348 from rfht/master
fix clang6 assignment error
-rw-r--r--scene/gui/rich_text_label.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 6bfc4d4dee..1fcde9e9a8 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -867,9 +867,9 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {
// Erase previous selection.
if (selection.active) {
selection.from = NULL;
- selection.from_char = NULL;
+ selection.from_char = '\0';
selection.to = NULL;
- selection.to_char = NULL;
+ selection.to_char = '\0';
selection.active = false;
update();