diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
commit | 48006292d8b3c6c8dd4bfe87bdbe271db93cffff (patch) | |
tree | ca98c07367717703c5a8801063cc42e0aff5b855 /source/blender/makesrna/intern | |
parent | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (diff) | |
parent | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (diff) |
svn merge ^/trunk/blender -r44189:44204
Diffstat (limited to 'source/blender/makesrna/intern')
4 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 5339ee58acf..0df8a625caf 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -475,7 +475,7 @@ static const char *rna_ensure_property_description(PropertyRNA *prop) } #ifdef WITH_INTERNATIONAL - if(description && (U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_TOOLTIPS)) + if(description && BLF_translate_tooltips()) description= BLF_gettext(description); #endif @@ -492,7 +492,7 @@ static const char *rna_ensure_property_name(PropertyRNA *prop) name= ((IDProperty*)prop)->name; #ifdef WITH_INTERNATIONAL - if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) { + if(BLF_translate_iface()) { if(prop->translation_context) name = BLF_pgettext(prop->translation_context, name); else @@ -1182,7 +1182,7 @@ void RNA_property_enum_items_gettexted(bContext *C, PointerRNA *ptr, PropertyRNA RNA_property_enum_items(C, ptr, prop, item, totitem, free); #ifdef WITH_INTERNATIONAL - if((U.transopts&USER_DOTRANSLATE) && (U.transopts&USER_TR_IFACE)) { + if(BLF_translate_iface()) { int i; EnumPropertyItem *nitem; diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index e9f8ecd1ef2..6d902ba037a 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -25,8 +25,8 @@ */ -#ifndef RNA_INTERNAL_H -#define RNA_INTERNAL_H +#ifndef __RNA_INTERNAL_H__ +#define __RNA_INTERNAL_H__ #include "UI_resources.h" @@ -387,6 +387,6 @@ void rna_mtex_texture_slots_clear(struct ID *self, struct bContext *C, struct Re int rna_IDMaterials_assign_int(struct PointerRNA *ptr, int key, const struct PointerRNA *assign_ptr); -#endif /* RNA_INTERNAL_H */ +#endif /* __RNA_INTERNAL_H__ */ diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index 40157d390bc..997f9d084c5 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -25,8 +25,8 @@ */ -#ifndef RNA_INTERNAL_TYPES_H -#define RNA_INTERNAL_TYPES_H +#ifndef __RNA_INTERNAL_TYPES_H__ +#define __RNA_INTERNAL_TYPES_H__ #include "DNA_listBase.h" @@ -358,4 +358,4 @@ struct BlenderRNA { #define CONTAINER_RNA_ID(cont) (*(const char **)(((ContainerRNA *)(cont))+1)) -#endif /* RNA_INTERNAL_TYPES_H */ +#endif /* __RNA_INTERNAL_TYPES_H__ */ diff --git a/source/blender/makesrna/intern/rna_nodetree_types.h b/source/blender/makesrna/intern/rna_nodetree_types.h index 2284b09e941..745a956d831 100644 --- a/source/blender/makesrna/intern/rna_nodetree_types.h +++ b/source/blender/makesrna/intern/rna_nodetree_types.h @@ -24,6 +24,7 @@ * \ingroup RNA */ +/* intentionally no include guard */ /* Empty definitions for undefined macros to avoid warnings */ #ifndef DefNode |