griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for uiButGetStrInfo: We need a string value here, return BPY_I18NCONTEXT_DEFAULT_BPY when using default NULL label's context.

Browse Source
This commit is contained in:
Bastien Montagne
2013-02-24 08:46:01 +00:00
parent ed1d215cea
commit c9d1f6fc5b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface.c
View File

@@ -3929,15 +3929,20 @@ void uiButGetStrInfo(bContext *C, uiBut *but, ...)
}
}
else if (type == BUT_GET_RNA_LABEL_CONTEXT) {
const char *_tmp = NULL;
if (but->rnaprop)
tmp = BLI_strdup(RNA_property_translation_context(but->rnaprop));
_tmp = RNA_property_translation_context(but->rnaprop);
else if (but->optype)
tmp = BLI_strdup(RNA_struct_translation_context(but->optype->srna));
_tmp = RNA_struct_translation_context(but->optype->srna);
else if (ELEM(but->type, MENU, PULLDOWN)) {
MenuType *mt = uiButGetMenuType(but);
if (mt)
tmp = BLI_strdup(RNA_struct_translation_context(mt->ext.srna));
_tmp = RNA_struct_translation_context(mt->ext.srna);
}
if (!_tmp) { /* _tmp == BLF_I18NCONTEXT_DEFAULT */
_tmp = BLF_I18NCONTEXT_DEFAULT_BPY;
}
tmp = BLI_strdup(_tmp);
}
else if (ELEM3(type, BUT_GET_RNAENUM_IDENTIFIER, BUT_GET_RNAENUM_LABEL, BUT_GET_RNAENUM_TIP)) {
PointerRNA *ptr = NULL;