Bug fix #2636
authorTon Roosendaal <ton@blender.org>
Sat, 28 May 2005 13:22:09 +0000 (13:22 +0000)
committerTon Roosendaal <ton@blender.org>
Sat, 28 May 2005 13:22:09 +0000 (13:22 +0000)
New AA font drawing (using texture) didn't get initialized on startup,
only when button was pressed. Confusing code... we need to remove all
#ifdefs here once.

source/blender/src/headerbuttons.c
source/blender/src/language.c

index 538bd7541f5f5ff18882132ec167d4d7750a2b0b..095e40b1f15c9fb347811ef747a690094778d9e0 100644 (file)
@@ -1613,11 +1613,6 @@ void do_global_buttons(unsigned short event)
                break;
                
        case B_USETEXTUREFONT:          /* is button from space.c  *info* */
-               if(U.transopts & USER_USETEXTUREFONT)
-                       FTF_SetMode(FTF_TEXTUREFONT);
-               else
-                       FTF_SetMode(FTF_PIXMAPFONT);
-
                refresh_interface_font();
                allqueue(REDRAWALL, 0);
                break;
index 460e616d20c271057037468c9895597eba4c2330..333248f8623f1dabdda5ef2b47a0e60c764f16bc 100644 (file)
@@ -239,6 +239,11 @@ void start_interface_font(void)
 {
        int result = 0;
 
+       if(U.transopts & USER_USETEXTUREFONT)
+               FTF_SetMode(FTF_TEXTUREFONT);
+       else
+               FTF_SetMode(FTF_PIXMAPFONT);
+       
        if(U.fontsize && U.fontname[0] ) { // we have saved user settings + fontpath
                
                // try loading font from U.fontname = full path to font in usersettings
@@ -257,6 +262,7 @@ void start_interface_font(void)
        }
 
        if(result) {
+               
                lang_setlanguage();
 
                G.ui_international = TRUE;