diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-07-07 15:27:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-07 15:27:11 +0200 |
commit | 284a322277067c0c185d2cd5ddfd83e9b5875b6d (patch) | |
tree | 6a27258a05f97d927ddd4ee778405064953d4ae9 /scene/gui | |
parent | 1b8711b56cb904f302a4b7e9ae33239ff47e6a9e (diff) | |
parent | a319e6e6232f3e6b9056bd26822f5aa3738b6cd6 (diff) |
Merge pull request #62818 from bruvzg/font_reg_fixes
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/rich_text_label.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 2441279797..05824d54f1 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -2081,7 +2081,7 @@ Ref<Font> RichTextLabel::_find_font(Item *p_item) { fontitem = fontitem->parent; } - return Ref<FontFile>(); + return Ref<Font>(); } int RichTextLabel::_find_font_size(Item *p_item) { @@ -4002,7 +4002,7 @@ void RichTextLabel::append_text(const String &p_bbcode) { if (subtag_a.size() == 2) { if (subtag_a[0] == "name" || subtag_a[0] == "n") { String fnt = subtag_a[1]; - Ref<Font> font_data = ResourceLoader::load(fnt, "FontFile"); + Ref<Font> font_data = ResourceLoader::load(fnt, "Font"); if (font_data.is_valid()) { fc->set_base_font(font_data); } |