interface_draw.c - when the char panel was displayed it would mess up font size for...
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2007 10:53:37 +0000 (10:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jun 2007 10:53:37 +0000 (10:53 +0000)
drawview.c - removed unneeded comment (as GSR pointed out)

source/blender/src/drawview.c
source/blender/src/interface_draw.c

index 42be877389a090a431383bd92b4c2671f004500d..6f1230b66ff4bf7ab4c5238dd898eb5f18662b19 100644 (file)
@@ -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);
index c7bcc510ef1141bdee0791ac50ebf7a6a0e66a98..4c6734a7be4f31c0468718d2e0f824bb2507de0d 100644 (file)
@@ -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