Przeglądaj źródła

Merge pull request #74212 from bruvzg/bmp_def_out

[Bitmap font] Assume outline size is `1` if it's not set, but channel for outline is defined.
Rémi Verschelde 2 lat temu
rodzic
commit
a2d449f22e
1 zmienionych plików z 6 dodań i 0 usunięć
  1. 6 0
      scene/resources/font.cpp

+ 6 - 0
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;