[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40563] trunk/blender: change define INTERNATIONAL --> WITH_INTERNATIONAL
Campbell Barton
ideasman42 at gmail.com
Mon Sep 26 12:35:48 CEST 2011
Revision: 40563
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40563
Author: campbellbarton
Date: 2011-09-26 10:35:47 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
change define INTERNATIONAL --> WITH_INTERNATIONAL
also rename backface_culling --> use_backface_culling (which is used elsewhere in rna)
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_material.py
trunk/blender/source/blender/blenfont/BLF_translation.h
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenfont/SConscript
trunk/blender/source/blender/blenfont/intern/blf_lang.c
trunk/blender/source/blender/blenfont/intern/blf_translation.c
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/interface/SConscript
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/interface_style.c
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/python/SConscript
trunk/blender/source/blender/python/intern/CMakeLists.txt
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blender/windowmanager/SConscript
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_material.py 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_material.py 2011-09-26 10:35:47 UTC (rev 40563)
@@ -625,7 +625,7 @@
game = context.material.game_settings # dont use node material
row = layout.row()
- row.prop(game, "backface_culling")
+ row.prop(game, "use_backface_culling")
row.prop(game, "invisible")
row.prop(game, "text")
Modified: trunk/blender/source/blender/blenfont/BLF_translation.h
===================================================================
--- trunk/blender/source/blender/blenfont/BLF_translation.h 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/blenfont/BLF_translation.h 2011-09-26 10:35:47 UTC (rev 40563)
@@ -37,7 +37,7 @@
/* blf_translation.c */
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
unsigned char *BLF_get_unifont(int *unifont_size);
void BLF_free_unifont(void);
#endif
Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-09-26 10:35:47 UTC (rev 40563)
@@ -55,7 +55,7 @@
list(APPEND INC_SYS
${GETTEXT_INC}
)
- add_definitions(-DINTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
endif()
blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/blenfont/SConscript
===================================================================
--- trunk/blender/source/blender/blenfont/SConscript 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/blenfont/SConscript 2011-09-26 10:35:47 UTC (rev 40563)
@@ -15,6 +15,6 @@
defs.append('_WIN32')
if env['WITH_BF_INTERNATIONAL']:
- defs.append('INTERNATIONAL')
+ defs.append('WITH_INTERNATIONAL')
env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core','player'], priority=[210,210] )
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -36,7 +36,7 @@
#include "BLF_api.h"
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
#include <locale.h>
@@ -209,7 +209,7 @@
/* bind_textdomain_codeset(DOMAIN_NAME, encoding_name); */
}
-#else /* ! INTERNATIONAL */
+#else /* ! WITH_INTERNATIONAL */
void BLF_lang_init(void)
{
@@ -228,4 +228,4 @@
return;
}
-#endif /* INTERNATIONAL */
+#endif /* WITH_INTERNATIONAL */
Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -32,7 +32,7 @@
#include <stdlib.h>
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
#include <libintl.h>
#endif
@@ -45,7 +45,7 @@
#include "BLF_translation.h"
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
const char unifont_filename[]="droidsans.ttf.gz";
static unsigned char *unifont_ttf= NULL;
static int unifont_size= 0;
@@ -76,7 +76,7 @@
const char* BLF_gettext(const char *msgid)
{
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
if( msgid[0] )
return gettext( msgid );
return "";
Modified: trunk/blender/source/blender/editors/interface/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/interface/CMakeLists.txt 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/CMakeLists.txt 2011-09-26 10:35:47 UTC (rev 40563)
@@ -60,7 +60,7 @@
)
if(WITH_INTERNATIONAL)
- add_definitions(-DINTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_HEADLESS)
Modified: trunk/blender/source/blender/editors/interface/SConscript
===================================================================
--- trunk/blender/source/blender/editors/interface/SConscript 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/SConscript 2011-09-26 10:35:47 UTC (rev 40563)
@@ -14,7 +14,7 @@
defs = []
if env['WITH_BF_INTERNATIONAL']:
- defs.append('INTERNATIONAL')
+ defs.append('WITH_INTERNATIONAL')
if env['WITH_BF_PYTHON']:
defs.append('WITH_PYTHON')
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -96,7 +96,7 @@
int UI_translate_iface(void)
{
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_IFACE);
#else
return 0;
@@ -105,7 +105,7 @@
int UI_translate_tooltips(void)
{
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_TOOLTIPS);
#else
return 0;
@@ -114,7 +114,7 @@
const char *UI_translate_do_iface(const char *msgid)
{
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
if(UI_translate_iface())
return BLF_gettext(msgid);
else
@@ -126,7 +126,7 @@
const char *UI_translate_do_tooltip(const char *msgid)
{
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
if(UI_translate_tooltips())
return BLF_gettext(msgid);
else
@@ -2741,7 +2741,7 @@
if ((!tip || tip[0]=='\0') && ot && ot->description) {
tip= ot->description;
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
if(UI_translate_tooltips())
tip= BLF_gettext(tip);
#endif
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -500,7 +500,7 @@
}
#if 0
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
static void ui_draw_but_CHARTAB(uiBut *but)
{
/* XXX 2.50 bad global access */
@@ -670,7 +670,7 @@
}
}
-#endif // INTERNATIONAL
+#endif // WITH_INTERNATIONAL
#endif
static void draw_scope_end(rctf *rect, GLint *scissor)
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -631,7 +631,7 @@
data->applied= 1;
}
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
static void ui_apply_but_CHARTAB(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
@@ -1023,7 +1023,7 @@
case IDPOIN:
ui_apply_but_IDPOIN(C, but, data);
break;
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
case CHARTAB:
ui_apply_but_CHARTAB(C, but, data);
break;
@@ -3924,7 +3924,7 @@
return WM_UI_HANDLER_CONTINUE;
}
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
static int ui_do_but_CHARTAB(bContext *UNUSED(C), uiBlock *UNUSED(block), uiBut *UNUSED(but), uiHandleButtonData *UNUSED(data), wmEvent *UNUSED(event))
{
/* XXX 2.50 bad global and state access */
@@ -4584,7 +4584,7 @@
case HSVCIRCLE:
retval= ui_do_but_HSVCIRCLE(C, block, but, data, event);
break;
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
case CHARTAB:
retval= ui_do_but_CHARTAB(C, block, but, data, event);
break;
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -639,7 +639,7 @@
if(!name) {
name= ot->name;
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
name= UI_translate_do_iface(name);
#endif
}
@@ -1432,7 +1432,7 @@
if(!name) {
name= mt->label;
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
name= UI_translate_do_iface(name);
#endif
}
Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -444,7 +444,7 @@
int pnl_icons;
const char *activename= panel->drawname[0]?panel->drawname:panel->panelname;
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
activename= UI_translate_do_iface(activename);
#endif
Modified: trunk/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_style.c 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/editors/interface/interface_style.c 2011-09-26 10:35:47 UTC (rev 40563)
@@ -322,7 +322,7 @@
for(font= U.uifonts.first; font; font= font->next) {
if(font->uifont_id==UIFONT_DEFAULT) {
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
int font_size= datatoc_bfont_ttf_size;
unsigned char *font_ttf= (unsigned char*)datatoc_bfont_ttf;
static int last_font_size = 0;
Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript 2011-09-26 10:25:38 UTC (rev 40562)
+++ trunk/blender/source/blender/makesrna/SConscript 2011-09-26 10:35:47 UTC (rev 40563)
@@ -63,6 +63,6 @@
incs += ' ' + env['BF_PTHREADS_INC']
if env['WITH_BF_INTERNATIONAL']:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list