[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40396] trunk/blender: - Fix for compiling without international support

[Sergey Sharybin]

Revision: 40396
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40396
Author:   nazgul
Date:     2011-09-20 14:07:40 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- Fix for compiling without international support
- Enable international support for win64 msvc by default

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2011-09-20 13:41:43 UTC (rev 40395)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2011-09-20 14:07:40 UTC (rev 40396)
@@ -96,7 +96,7 @@
 BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
-WITH_BF_INTERNATIONAL = False
+WITH_BF_INTERNATIONAL = True
 
 BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2011-09-20 13:41:43 UTC (rev 40395)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2011-09-20 14:07:40 UTC (rev 40396)
@@ -402,7 +402,10 @@
 	free_posebuf();
 
 	BLF_exit();
+
+#ifdef INTERNATIONAL
 	BLF_free_unifont();
+#endif
 	
 	ANIM_keyingset_infos_exit();
 	

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-09-20 13:41:43 UTC (rev 40395)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-09-20 14:07:40 UTC (rev 40396)
@@ -998,7 +998,11 @@
 	// Cleanup
 	RNA_exit();
 	BLF_exit();
+
+#ifdef INTERNATIONAL
 	BLF_free_unifont();
+#endif
+
 	IMB_exit();
 	free_nodesystem();