diff options
| -rw-r--r-- | source/blender/src/drawview.c | 3 | ||||
| -rw-r--r-- | source/blender/src/interface_draw.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 42be877389a..6f1230b66ff 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1515,8 +1515,7 @@ static void draw_viewport_name(ScrArea *sa) name = (G.vd->persp & V3D_PERSP_DO_3D_PERSP) ? "User Persp" : "User Ortho"; } } - - /* Easy sync of tests to clean up the string allocation */ + if (G.vd->localview) { printable = malloc(strlen(name) + strlen(" (Local)_")); /* '_' gives space for '\0' */ strcpy(printable, name); diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index c7bcc510ef1..4c6734a7be4 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -1785,7 +1785,7 @@ static void ui_draw_but_CHARTAB(uiBut *but) PackedFile *pf; int result = 0; int charmax = G.charmax; - + /* <builtin> font in use. There are TTF <builtin> and non-TTF <builtin> fonts */ if(!strcmp(G.selfont->name, "<builtin>")) { @@ -1947,6 +1947,12 @@ static void ui_draw_but_CHARTAB(uiBut *but) { result = FTF_SetFont((unsigned char *) datatoc_bfont_ttf, datatoc_bfont_ttf_size, 11); } + + /* resets the font size */ + if(G.ui_international == TRUE) + { + uiSetCurFont(but->block, UI_HELV); + } } #endif // INTERNATIONAL |