[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35067] trunk/blender/source/blender/ blenfont/intern/blf_lang.c: No idea why this goes wrong, but I can' t get preprocessor output with
Ton Roosendaal
ton at blender.org
Tue Feb 22 13:01:57 CET 2011
Revision: 35067
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35067
Author: ton
Date: 2011-02-22 12:01:57 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_lang.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-02-22 11:43:50 UTC (rev 35066)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-02-22 12:01:57 UTC (rev 35067)
@@ -71,11 +71,15 @@
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
More information about the Bf-blender-cvs
mailing list