diff options
| author | Simon Clitherow <aphex@nildram.co.uk> | 2003-05-22 22:06:25 +0400 |
|---|---|---|
| committer | Simon Clitherow <aphex@nildram.co.uk> | 2003-05-22 22:06:25 +0400 |
| commit | d617df479310b39c8f0ba8f1cbd57bc29d95a8f9 (patch) | |
| tree | dd944f5543f13d11b4fbf6be3357685b508bb88f /source/blender/ftfont | |
| parent | b8f2835ba28e7dec09086599127c48b54c9fd3e7 (diff) | |
- fixed 'double-click on blend file' errors on Windows -- INTERNATIONAL stuff now also checks the installation directory for /.blender, etc
- registering .blend files for WinNT/2000/XP now works correctly (settings remain after a reboot).
Diffstat (limited to 'source/blender/ftfont')
| -rw-r--r-- | source/blender/ftfont/intern/FTF_TTFont.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/ftfont/intern/FTF_TTFont.cpp b/source/blender/ftfont/intern/FTF_TTFont.cpp index 50839c44063..6f50c2e0841 100644 --- a/source/blender/ftfont/intern/FTF_TTFont.cpp +++ b/source/blender/ftfont/intern/FTF_TTFont.cpp @@ -43,8 +43,6 @@ #include "BKE_utildefines.h" #endif -#include "BLI_blenlib.h" - #define DOMAIN_NAME "blender" #define SYSTEM_ENCODING_DEFAULT "UTF-8" @@ -117,6 +115,13 @@ FTF_TTFont::FTF_TTFont(void) BLI_make_file_string("/", messagepath, BLI_gethome(), ".blender/locale"); if(BLI_exist(messagepath) == NULL) { // locale not in home dir + +#ifdef WIN32 + /* message catalogs are stored in the installation dir */ + BLI_getInstallationDir(messagepath); + strcat(messagepath, "/.blender/locale"); + if(BLI_exist(messagepath) == NULL) { +#endif #ifdef __APPLE__ /* message catalogs are stored inside the application bundle */ bundlepath = BLI_getbundle(); @@ -129,6 +134,9 @@ FTF_TTFont::FTF_TTFont(void) if(BLI_exist(messagepath) == NULL) { // locale not in LOCALEDIR strcpy(messagepath, "message"); // old compatibility as last } +#ifdef WIN32 + } +#endif #ifdef __APPLE__ } #endif |