diff options
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 575b32e81e8..694794193da 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -110,7 +110,7 @@ bool ui_but_menu_step_poll(const uiBut *but) { BLI_assert(but->type == UI_BTYPE_MENU); - /* currenly only RNA buttons */ + /* currently only RNA buttons */ return ((but->menu_step_func != NULL) || (but->rnaprop && RNA_property_type(but->rnaprop) == PROP_ENUM)); } @@ -459,6 +459,11 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but) data->format[data->totline].color_id = UI_TIP_LC_NORMAL; data->totline++; } + else if (ID_IS_LINKED_DATAPATH(id)) { + BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Using file path as asset")); + data->format[data->totline].color_id = UI_TIP_LC_NORMAL; + data->totline++; + } } } else if (but->optype) { @@ -3331,6 +3336,11 @@ void UI_popup_block_close(bContext *C, wmWindow *win, uiBlock *block) if (win) { UI_popup_handlers_remove(&win->modalhandlers, block->handle); ui_popup_block_free(C, block->handle); + + /* In the case we have nested popups, closing one may need to redraw anorher, see: T48874 */ + for (ARegion *ar = win->screen->regionbase.first; ar; ar = ar->next) { + ED_region_tag_refresh_ui(ar); + } } } } |