From a5790b26563c216dce262586369fdca1061b4850 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Tue, 28 Jan 2020 15:08:26 +0100 Subject: Fix T63999: Filepath property won't open filebrowser from a popover To issues caused this: * The code to launch the filebrowser from a button didn't respect popup menus stored in context * There was actually no popup menu region stored in context for this case. Doing so *may* introduce other issues, but the way I did things already fixes all issues I've found. --- source/blender/editors/screen/screen_edit.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/editors/screen/screen_edit.c') diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 501c36286d0..95293a23c26 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -558,6 +558,9 @@ void ED_region_exit(bContext *C, ARegion *ar) WM_msgbus_clear_by_owner(wm->message_bus, ar); CTX_wm_region_set(C, prevar); + if (CTX_wm_menu(C) == ar) { + CTX_wm_region_set(C, NULL); + } } void ED_area_exit(bContext *C, ScrArea *sa) -- cgit v1.2.3