Merge pull request #44212 from bruvzg/color_font_fix_32

[3.2] Fix fallback emoji font color.
This commit is contained in:
Rémi Verschelde 2020-12-09 11:20:39 +01:00 committed by GitHub
commit 84b62c0ba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -326,7 +326,7 @@ float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2 &p_pos, CharT
cpos.y -= font->get_ascent(); cpos.y -= font->get_ascent();
cpos.y += ch->v_align; cpos.y += ch->v_align;
Color modulate = p_modulate; Color modulate = p_modulate;
if (FT_HAS_COLOR(face)) { if (FT_HAS_COLOR(font->face)) {
modulate.r = modulate.g = modulate.b = 1.0; modulate.r = modulate.g = modulate.b = 1.0;
} }
RID texture = font->textures[ch->texture_idx].texture->get_rid(); RID texture = font->textures[ch->texture_idx].texture->get_rid();