archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-11-29 14:21:03 +11:00
parent f89563a806 26a64ba23a
commit 0c8265c0a9
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/makesrna/RNA_access.h
View File

@@ -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 */

3
source/blender/makesrna/intern/rna_access.c
View File

@@ -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);
}

4
source/blender/makesrna/intern/rna_ui_api.c
View File

@@ -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()) {