change define INTERNATIONAL --> WITH_INTERNATIONAL
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Sep 2011 10:35:47 +0000 (10:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Sep 2011 10:35:47 +0000 (10:35 +0000)
also rename backface_culling --> use_backface_culling (which is used elsewhere in rna)

28 files changed:
release/scripts/startup/bl_ui/properties_material.py
source/blender/blenfont/BLF_translation.h
source/blender/blenfont/CMakeLists.txt
source/blender/blenfont/SConscript
source/blender/blenfont/intern/blf_lang.c
source/blender/blenfont/intern/blf_translation.c
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/SConscript
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_style.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_material.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy_rna.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/blender/windowmanager/intern/wm_init_exit.c
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/GamePlayer/ghost/SConscript

index de527f9e9b8d5e7280eeec967b69f3ef8fe6d9fb..5b00402520e9bd849789787b6d26f9cd0ca3fd41 100644 (file)
@@ -625,7 +625,7 @@ class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel):
         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")
 
index 4377d3913549bde411b4905ecdff21796696f319..1c36f3e150475e6a598139860bd618b14536df79 100644 (file)
@@ -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
index b87a3b88f077d1db4348ccdedb6bc4dfded2dc1c..838a36d9fe2a949ecc10ba5795d5d6dd077a5670 100644 (file)
@@ -55,7 +55,7 @@ if(WITH_INTERNATIONAL)
        list(APPEND INC_SYS
                ${GETTEXT_INC}
        )
-       add_definitions(-DINTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
index 45a557938563b4d1bd60d371661d844578d7da80..1a86d0ad671fc70dc5f234dfdbdbf9b1823354e9 100644 (file)
@@ -15,6 +15,6 @@ if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
     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] )
index b0b06bf059be362f0d8582eaac0a5a7d98930f32..b5c6b5bd68ce6b8824f5cae7883c4eeace8ec73a 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "BLF_api.h"
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
 
 #include <locale.h>
 
@@ -209,7 +209,7 @@ void BLF_lang_encoding(const char *str)
        /* bind_textdomain_codeset(DOMAIN_NAME, encoding_name); */
 }
 
-#else /* ! INTERNATIONAL */
+#else /* ! WITH_INTERNATIONAL */
 
 void BLF_lang_init(void)
 {
@@ -228,4 +228,4 @@ void BLF_lang_set(const char *str)
        return;
 }
 
-#endif /* INTERNATIONAL */
+#endif /* WITH_INTERNATIONAL */
index b53f4cf7609fbf86dab356f920788b3bdf1bcb5b..8c0a26df4c22d73a63a5c34eae4166cbea149bd4 100644 (file)
@@ -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 @@ void BLF_free_unifont(void)
 
 const char* BLF_gettext(const char *msgid)
 {
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
        if( msgid[0] )
                return gettext( msgid );
        return "";
index cc4c1eaa21cdf2a1f681e8bd931ba135b93dc64e..678be82f16049b0720a34e4b71ba6de0eef9c749 100644 (file)
@@ -60,7 +60,7 @@ set(SRC
 )
 
 if(WITH_INTERNATIONAL)
-       add_definitions(-DINTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 if(WITH_HEADLESS)
index 5998d4d29539f7b1643f105a71ae300fba6a1af3..ec5ae99755dfade9f74213908ba0982e0c083324 100644 (file)
@@ -14,7 +14,7 @@ incs += ' ../../python/' # python button eval
 defs = []
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')
 
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
index 32fe0fb86f9d9678d3755c3d9189bc08fb0aa1a3..8f440f7b61ab371c8a2f1a5ae264070f978a4914 100644 (file)
@@ -96,7 +96,7 @@ static void ui_free_but(const bContext *C, uiBut *but);
 
 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_iface(void)
 
 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 @@ int UI_translate_tooltips(void)
 
 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_iface(const char *msgid)
 
 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 @@ static uiBut *ui_def_but_operator(uiBlock *block, int type, const char *opname,
        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
index a1275e237c1fa3223e4d780e54bdd4365eff799a..fd437d2b0e53cf37861b84c802a8bd4e1ef22695 100644 (file)
@@ -500,7 +500,7 @@ void ui_draw_but_IMAGE(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(w
 }
 
 #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 @@ static void ui_draw_but_CHARTAB(uiBut *but)
        }
 }
 
-#endif // INTERNATIONAL
+#endif // WITH_INTERNATIONAL
 #endif
 
 static void draw_scope_end(rctf *rect, GLint *scissor)
index 125928c136bea65f99bfb476964c1c8e9f12285e..e4776cdb5f25f36cf6ed921ee860234c642a2681 100644 (file)
@@ -631,7 +631,7 @@ static void ui_apply_but_IDPOIN(bContext *C, uiBut *but, uiHandleButtonData *dat
        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 @@ static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleBut
                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 @@ static int ui_do_but_VECTORSCOPE(bContext *C, uiBlock *block, uiBut *but, uiHand
        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 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
        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;
index 3c02f7d4bd2c05f07e927242aecebd2b3d5af4b8..ae66d649a062735845f5989cd59844e5e16e691f 100644 (file)
@@ -639,7 +639,7 @@ PointerRNA uiItemFullO(uiLayout *layout, const char *opname, const char *name, i
        if(!name) {
                name= ot->name;
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
                name= UI_translate_do_iface(name);
 #endif
        }
@@ -1432,7 +1432,7 @@ void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const
        if(!name) {
                name= mt->label;
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
                name= UI_translate_do_iface(name);
 #endif
        }
index ec7456eebdce05f53af8a34775cd8eb4d9ac52ba..c25e7f23c04c8e38e0bc85499b614e22f4f542bb 100644 (file)
@@ -444,7 +444,7 @@ static void ui_draw_aligned_panel_header(uiStyle *style, uiBlock *block, rcti *r
        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
 
index 3a9879384a3756a348fe02e518fcb6826e34fc26..2a183e3d994d3ededfc13da8180535719a1c80cf 100644 (file)
@@ -322,7 +322,7 @@ void uiStyleInit(void)
        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;
index d0002eda30b363cb6b1a8a550cf91e5b60de5f8f..da186a57c8bbcbfae0f438ffe996ce5d841a2546 100644 (file)
@@ -63,6 +63,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')
 
 env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )
index 966bc8f100c86f0129ccba944f6b43646da09be1..99c7a0e247627ff34027bd907e8b32b266fac3b4 100644 (file)
@@ -220,7 +220,7 @@ if(WITH_OPENCOLLADA)
 endif()
 
 if(WITH_INTERNATIONAL)
-       add_definitions(-DINTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 # Build makesrna executable
index ef05875fe86eb1ab16c6071da8b29804749aa2ee..d710dd06a17680753a27e5375e13a074997cee2e 100644 (file)
@@ -99,7 +99,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')
 
 makesrna_tool.Append(CPPDEFINES=defs)
 
index b7709416a75ba319afce7bac4bab66b52a190749..b52de6a49b6bd5fe3d43381ea76a6902a68b3312 100644 (file)
@@ -470,7 +470,7 @@ static const char *rna_ensure_property_description(PropertyRNA *prop)
                        description= ((IDProperty*)prop)->name; /* XXX - not correct */
        }
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
        if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS))
                description= BLF_gettext(description);
 #endif
@@ -487,7 +487,7 @@ static const char *rna_ensure_property_name(PropertyRNA *prop)
        else
                name= ((IDProperty*)prop)->name;
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
        if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE))
                name= BLF_gettext(name);
 #endif
@@ -1160,7 +1160,7 @@ void RNA_property_enum_items_gettexted(bContext *C, PointerRNA *ptr, PropertyRNA
 {
        RNA_property_enum_items(C, ptr, prop, item, totitem, free);
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
        if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) {
                int i;
                EnumPropertyItem *nitem;
index 54631da7bca0f58fe21f3d40365326c81b23cdf0..80a418a0047b2fc1c440453ef9870e673a12598a 100644 (file)
@@ -767,7 +767,7 @@ static void rna_def_material_gamesettings(BlenderRNA *brna)
        RNA_def_struct_nested(brna, srna, "Material");
        RNA_def_struct_ui_text(srna, "Material Game Settings", "Game Engine settings for a Material datablock");
        
-       prop= RNA_def_property(srna, "backface_culling", PROP_BOOLEAN, PROP_NONE);
+       prop= RNA_def_property(srna, "use_backface_culling", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", GEMAT_BACKCULL); /* use bitflags */
        RNA_def_property_ui_text(prop, "Backface Culling", "Hide Back of the face in Game Engine ");
        RNA_def_property_update(prop, 0, "rna_Material_draw_update");
index f00d49fe8dd6ac2bb7f13d6fb030b80e28d3d8a7..3f47038687a059f0543d74f2809718101083811d 100644 (file)
@@ -41,7 +41,7 @@ if env['BF_BUILDINFO']:
     defs.append('BUILD_DATE')
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')
 
 sources = env.Glob('intern/*.c')
 env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])
index e628ea10e9c8c7a0dafb86e8fdaba324fa562c8b..0d5b980acba6e77345172d315c429394a8450b2c 100644 (file)
@@ -96,7 +96,7 @@ if(WITH_AUDASPACE)
 endif()
 
 if(WITH_INTERNATIONAL)
-        add_definitions(-DINTERNATIONAL)
+        add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}")
index 013eac7fd58c8552d629790159fccc40d541f065..3175c0d088e1d37cf584568c4a0faed66ecb5033 100644 (file)
@@ -73,7 +73,7 @@
 #include "../generic/IDProp.h" /* for IDprop lookups */
 #include "../generic/py_capi_utils.h"
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
 #include "UI_interface.h" /* bad level call into editors */
 #endif
 
@@ -1523,11 +1523,11 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
                        }
                        else {
                                param= _PyUnicode_AsString(value);
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
                                if(subtype == PROP_TRANSLATE) {
                                        param= UI_translate_do_iface(param);
                                }
-#endif // INTERNATIONAL
+#endif // WITH_INTERNATIONAL
 
                        }
 #else // USE_STRING_COERCE
index 7c34c086b2e2ceca0db7a9636ea23a4fe64c5060..7da2e17ad894101ad2cd1f3cdd59e65c7bf43794 100644 (file)
@@ -82,7 +82,7 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_INTERNATIONAL)
-       add_definitions(-DINTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 if(WITH_OPENCOLLADA)
index c60752b85f8d8fdfb3ebb74590b53f9d63bd1a3e..ef6ddd18bb17e8beb470361a9f7fc95c3e62fb76 100644 (file)
@@ -40,6 +40,6 @@ if env['BF_BUILDINFO']:
     defs.append('WITH_BUILDINFO')
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')
 
 env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] )
index cf3f12da7674944641e9dd7508a3433d9989c89f..3d7737830eb5aa9330f3e6ce69c4589cc01b2522 100644 (file)
@@ -403,7 +403,7 @@ void WM_exit_ext(bContext *C, const short do_python)
 
        BLF_exit();
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
        BLF_free_unifont();
 #endif
        
index b452bb97cded3fadd66d42596918ccbcc330c68c..479cf3fd7ccfa20aba9d01286ee89c995afc89bc 100644 (file)
@@ -79,7 +79,7 @@ if(WITH_CODEC_FFMPEG)
 endif()
 
 if(WITH_INTERNATIONAL)
-       add_definitions(-DINTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}" "${INC_SYS}")
index 726a1d4119ab79404d6c453ba262db1f3f10861c..f5bd3a91c265c4a7a4b17c829ab7dd3b7dd3403f 100644 (file)
@@ -999,7 +999,7 @@ int main(int argc, char** argv)
        RNA_exit();
        BLF_exit();
 
-#ifdef INTERNATIONAL
+#ifdef WITH_INTERNATIONAL
        BLF_free_unifont();
 #endif
 
index 57c1122c2cd7bcd76f0b062e6401401b3435fae6..9fb0f053ed8f50ddbe3239790fc103f9449280bd 100644 (file)
@@ -52,6 +52,6 @@ if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs.append('INTERNATIONAL')
+    defs.append('WITH_INTERNATIONAL')
 
 env.BlenderLib (libname='ge_player_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])