diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-02-22 15:01:57 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-02-22 15:01:57 +0300 |
| commit | 1ad603c39e8c16902df66876e5e2fb9920ae1f4f (patch) | |
| tree | c00f6aec3d22668be40dce9c20c320eceb7c26a9 | |
| parent | 148eb5ca9c4fed270209dd662b2d7cadcea0afd4 (diff) | |
No idea why this goes wrong, but I can't get preprocessor output with
cmake here.
Somehow in OSX a function call doesn't return but enters a next function.
Will find around if someone else can make an OSX preprocessed version
of this C file. With this commit things go fine, and it's a sane check
anyway.
| -rw-r--r-- | source/blender/blenfont/intern/blf_lang.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index a9322944ce5..c749aadade8 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -71,11 +71,15 @@ void BLF_lang_init(void) BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); else global_messagepath[0]= '\0'; + } - +/* XXX WARNING!!! IN osx somehow the previous function call jumps in this one??? (ton, ppc) */ void BLF_lang_set(const char *str) { + if(str==NULL) + return; + #if defined (_WIN32) || defined(__APPLE__) BLI_setenv("LANG", str); #else |