blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Cleanup: quiet compiler shadowed variable warning

This commit is contained in:
Campbell Barton 2022-10-07 13:19:12 +11:00
parent 104fd82f74
commit db2b889618
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/vfontdata_freetype.c
View File

@ -281,14 +281,14 @@ static FT_Face vfont_face_load_from_packed_file(PackedFile *pf)
}
/* Select a character map. */
FT_Error err = FT_Select_Charmap(face, FT_ENCODING_UNICODE);
if (err) {
err = FT_Select_Charmap(face, FT_ENCODING_APPLE_ROMAN);
FT_Error err_charmap = FT_Select_Charmap(face, FT_ENCODING_UNICODE);
if (err_charmap) {
err_charmap = FT_Select_Charmap(face, FT_ENCODING_APPLE_ROMAN);
}
if (err && face->num_charmaps > 0) {
err = FT_Select_Charmap(face, face->charmaps[0]->encoding);
if (err_charmap && face->num_charmaps > 0) {
err_charmap = FT_Select_Charmap(face, face->charmaps[0]->encoding);
}
if (err) {
if (err_charmap) {
FT_Done_Face(face);
return NULL;
}