diff options
Diffstat (limited to 'source/blender/editors/interface/interface_region_tooltip.c')
| -rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index f2ca9cebf7b..3f20e8247b9 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -860,10 +860,10 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but) /* move ownership (no need for re-alloc) */ if (but->rnaprop) { field->text = RNA_path_full_property_py_ex( - &but->rnapoin, but->rnaprop, but->rnaindex, true); + CTX_data_main(C), &but->rnapoin, but->rnaprop, but->rnaindex, true); } else { - field->text = RNA_path_full_struct_py(&but->rnapoin); + field->text = RNA_path_full_struct_py(CTX_data_main(C), &but->rnapoin); } } } @@ -932,18 +932,14 @@ static uiTooltipData *ui_tooltip_data_from_gizmo(bContext *C, wmGizmo *gz) NULL; if (gzop != NULL) { /* Description */ - const char *info = RNA_struct_ui_description(gzop->type->srna); - if (!(info && info[0])) { - info = RNA_struct_ui_name(gzop->type->srna); - } + char *info = WM_operatortype_description(C, gzop->type, &gzop->ptr); + + if (info != NULL) { + char *text = info; - if (info && info[0]) { - char *text = NULL; if (gzop_actions[i].prefix != NULL) { text = BLI_sprintfN("%s: %s", gzop_actions[i].prefix, info); - } - else { - text = BLI_strdup(info); + MEM_freeN(info); } if (text != NULL) { |