diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-05-28 17:22:09 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-05-28 17:22:09 +0400 |
| commit | ad9ee622e8d0db6cdd0c91cfa1679193140e746c (patch) | |
| tree | 31f962cab1b61ebd6a95a4a68f2e522e7e8fae5a | |
| parent | eeefc10bf5bb8ca7f4f9041b654a2955507075df (diff) | |
Bug fix #2636
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.
| -rw-r--r-- | source/blender/src/headerbuttons.c | 5 | ||||
| -rw-r--r-- | source/blender/src/language.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index 538bd7541f5..095e40b1f15 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -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; diff --git a/source/blender/src/language.c b/source/blender/src/language.c index 460e616d20c..333248f8623 100644 --- a/source/blender/src/language.c +++ b/source/blender/src/language.c @@ -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; |