diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-04-09 17:51:48 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-04-09 17:51:48 +0400 |
| commit | c9d7d11215a5638bd1112320def6de7cc9f8e318 (patch) | |
| tree | 0858b68cab1aa1c2e9e5134568d706ff4dfe10d0 | |
| parent | 1c3a1ba3612c47a68aa4fbb56d5d487cf90310f6 (diff) | |
Bug #1141
When choosing 'International fonts' this variable was not reset
when loading .B.blend again with CTRL+X.
Move the check for this to read_homefile() instead of init() call.
| -rw-r--r-- | source/blender/src/previewrender.c | 4 | ||||
| -rw-r--r-- | source/blender/src/usiblender.c | 25 |
2 files changed, 14 insertions, 15 deletions
diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c index 2a394633df3..a5543d8276a 100644 --- a/source/blender/src/previewrender.c +++ b/source/blender/src/previewrender.c @@ -82,6 +82,8 @@ #include "BIF_drawimage.h" /* rectwrite_part */ #include "BIF_mywindow.h" #include "BIF_interface.h" +#include "BIF_glutil.h" + #include "PIL_time.h" #include "RE_renderconverter.h" @@ -277,6 +279,8 @@ static void display_pr_scanline(unsigned int *rect, int recty) glRasterPos2f( (float)PR_XMIN+0.5, 1.0+(float)PR_YMIN + (recty*PR_FACY) ); glDrawPixels(PR_RECTX, 3, GL_RGBA, GL_UNSIGNED_BYTE, rect); + //glaDrawPixelsTex((float)PR_XMIN, (float)PR_YMIN + (recty*PR_FACY), PR_RECTX, 3, rect); + glPixelZoom(1.0, 1.0); /* flush opengl for cards with frontbuffer slowness */ diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 873847edcd9..038184ccf49 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -221,18 +221,21 @@ int BIF_read_homefile(void) U.vrmlflag= USER_VRML_LAYERS; } -#ifndef __sgi - /* startup 2.26 with aa fonts ! */ - if (G.main->versionfile <= 225) { - U.transopts |= USER_DOTRANSLATE; - } -#endif - space_set_commmandline_options(); if (U.undosteps==0) U.undosteps=32; reset_autosave(); + +#ifdef INTERNATIONAL + read_languagefile(); + + if(U.transopts & USER_DOTRANSLATE) + start_interface_font(); + else + G.ui_international = FALSE; +#endif // INTERNATIONAL + } return success; @@ -501,14 +504,6 @@ void BIF_init(void) readBlog(); strcpy(G.lib, G.sce); -#ifdef INTERNATIONAL - read_languagefile(); - - if(U.transopts & USER_DOTRANSLATE) - start_interface_font(); - else - G.ui_international = FALSE; -#endif // INTERNATIONAL } /***/ |