summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-06-15 11:03:46 +0200
committerGitHub <noreply@github.com>2020-06-15 11:03:46 +0200
commitc6f48f5bfc6c06f8faa4e40b3a90ced93fe53141 (patch)
treea6032cdada0749ff9dbbef003a0f6c4647fdcedf /scene
parent808e0d3693c741edbaedfb7f4bf6482b21cfa327 (diff)
parent88b30a29bf6f5497b1f42e33c6dfbff795fd5585 (diff)
Merge pull request #39485 from theoway/append_bbcode_animation_bug
Fixes the stopping of animation effects in bbcode text after appending
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/rich_text_label.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 662eae394f..92508f7fd2 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -2412,6 +2412,17 @@ Error RichTextLabel::append_bbcode(const String &p_bbcode) {
}
}
+ Vector<ItemFX *> fx_items;
+ for (List<Item *>::Element *E = main->subitems.front(); E; E = E->next()) {
+ Item *subitem = static_cast<Item *>(E->get());
+ _fetch_item_fx_stack(subitem, fx_items);
+
+ if (fx_items.size()) {
+ set_process_internal(true);
+ break;
+ }
+ }
+
return OK;
}