Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-11 18:31:04 +10:00
commit 067587c51b
1 changed files with 2 additions and 1 deletions

View File

@ -1451,11 +1451,12 @@ ARegion *UI_tooltip_create_from_button(bContext *C, ARegion *butregion, uiBut *b
}
else {
init_position[0] = BLI_rctf_cent_x(&but->rect);
init_position[1] = but->rect.ymin - (UI_POPUP_MARGIN / 2);
init_position[1] = but->rect.ymin;
if (butregion) {
ui_block_to_window_fl(butregion, but->block, &init_position[0], &init_position[1]);
init_position[0] = win->eventstate->x;
}
init_position[1] -= (UI_POPUP_MARGIN / 2);
}
ARegion *region = ui_tooltip_create_with_data(