summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2023-02-26 18:32:19 +0200
committerYuri Sizov <yuris@humnom.net>2023-03-13 21:41:21 +0100
commit48a639f4a5919cd8f1713d7ac8376447fb1de2ac (patch)
tree15d0514da80558100b05728a85a100c1d84ffcbb /scene
parent57dc06087908474e6929abd1e0f3c099799b353d (diff)
[Bitmap font] Assume outline size is `1` if it's not set, but channel for outline is defined.
(cherry picked from commit 67762ec4a6c5e45951a238453188ce9f93cb24d9)
Diffstat (limited to 'scene')
-rw-r--r--scene/resources/font.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 0f7985bee6..f6e224aca0 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -1458,6 +1458,9 @@ Error FontFile::load_bitmap_font(const String &p_path) {
}
if (ch[i] == 1 && first_ol_ch == -1) {
first_ol_ch = i;
+ if (outline == 0) {
+ outline = 1;
+ }
}
if (ch[i] == 2 && first_cm_ch == -1) {
first_cm_ch = i;
@@ -1747,6 +1750,9 @@ Error FontFile::load_bitmap_font(const String &p_path) {
}
if (ch[i] == 1 && first_ol_ch == -1) {
first_ol_ch = i;
+ if (outline == 0) {
+ outline = 1;
+ }
}
if (ch[i] == 2 && first_cm_ch == -1) {
first_cm_ch = i;