diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-29 06:21:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-29 06:21:03 +0300 |
| commit | 0c8265c0a9f104d2a27d6ce5c124198239430d08 (patch) | |
| tree | 65aac835764eba6e600d31cc8df140294fe5524f | |
| parent | f89563a806479bd609a894a91dfb1756999fe562 (diff) | |
| parent | 26a64ba23a8e5586f2dfb72195a30bcf8acd9c90 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 5 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index aedc53512b7..60c2480a2ff 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -1209,9 +1209,8 @@ int RNA_function_call_direct_va(struct bContext *C, struct ReportList *reports, int RNA_function_call_direct_va_lookup(struct bContext *C, struct ReportList *reports, PointerRNA *ptr, const char *identifier, const char *format, va_list args); -const char *RNA_translate_ui_text(const char *text, const char *text_ctxt, - struct StructRNA *type, struct PropertyRNA *prop, - int translate); +const char *RNA_translate_ui_text( + const char *text, const char *text_ctxt, struct StructRNA *type, struct PropertyRNA *prop, int translate); /* ID */ diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 9c510176bb2..22938de1ba9 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -6860,8 +6860,7 @@ int RNA_function_call_direct_va_lookup(bContext *C, ReportList *reports, Pointer } const char *RNA_translate_ui_text( - const char *text, const char *text_ctxt, StructRNA *type, PropertyRNA *prop, - int translate) + const char *text, const char *text_ctxt, StructRNA *type, PropertyRNA *prop, int translate) { return rna_translate_ui_text(text, text_ctxt, type, prop, translate); } diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 2bed0eb7429..0b44809cf48 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -60,8 +60,8 @@ const EnumPropertyItem rna_enum_icon_items[] = { #ifdef RNA_RUNTIME -const char *rna_translate_ui_text(const char *text, const char *text_ctxt, StructRNA *type, PropertyRNA *prop, - int translate) +const char *rna_translate_ui_text( + const char *text, const char *text_ctxt, StructRNA *type, PropertyRNA *prop, int translate) { /* Also return text if UI labels translation is disabled. */ if (!text || !text[0] || !translate || !BLT_translate_iface()) { |