diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 08:28:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 08:32:43 +0300 |
commit | 38dafd5f44a07b4937ca53cf67cce4093d5797f7 (patch) | |
tree | 02612f48da66659340d3fd5b7ebd514502fd8e29 /source/blender/editors/interface/interface_region_tooltip.c | |
parent | 032129ef3527424de241f381376a3b94a2247965 (diff) | |
parent | 693b41eb17557ba12e7c64c5ba589c499ff45c4d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_region_tooltip.c')
-rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 9a818efebee..07fbefa42e1 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -953,9 +953,9 @@ ARegion *UI_tooltip_create_from_manipulator(bContext *C, wmManipulator *mpr) return ui_tooltip_create_with_data(C, data, init_position, aspect); } -void UI_tooltip_free(bContext *C, ARegion *ar) +void UI_tooltip_free(bContext *C, bScreen *sc, ARegion *ar) { - ui_region_temp_remove(C, CTX_wm_screen(C), ar); + ui_region_temp_remove(C, sc, ar); } /** \} */ |