From 1ad603c39e8c16902df66876e5e2fb9920ae1f4f Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 22 Feb 2011 12:01:57 +0000 Subject: 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. --- source/blender/blenfont/intern/blf_lang.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3