diff options
author | Hans Goudey <h.goudey@me.com> | 2020-09-15 01:36:42 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-09-15 01:36:42 +0300 |
commit | e13e8d727a74a90b8d8d5e527c7ee76afe338a4c (patch) | |
tree | 19d85eabc8db1698e22e3a6147c21452799346af /source/blender/editors/interface/interface_panel.c | |
parent | adaf9947b108c6c174114dafe35b39196cfd76f9 (diff) | |
parent | b037801f5ec39e5e1a2a3919797f65a8d16116bf (diff) |
Merge branch 'property-search-all-tabs-v2' into property-search-ui-v2property-search-ui-v2
Diffstat (limited to 'source/blender/editors/interface/interface_panel.c')
-rw-r--r-- | source/blender/editors/interface/interface_panel.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 95b4cbc82cc..51df6ae5676 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -2647,13 +2647,6 @@ static void ui_handler_remove_panel(bContext *C, void *userdata) panel_activate_state(C, panel, PANEL_STATE_EXIT); } -void UI_region_panels_remove_handlers(const bContext *C, ARegion *region) -{ - LISTBASE_FOREACH (Panel *, panel, ®ion->panels) { - panel_activate_state(C, panel, PANEL_STATE_EXIT); - } -} - static void panel_activate_state(const bContext *C, Panel *panel, uiHandlePanelState state) { uiHandlePanelData *data = panel->activedata; @@ -2681,13 +2674,11 @@ static void panel_activate_state(const bContext *C, Panel *panel, uiHandlePanelS } if (state == PANEL_STATE_EXIT) { - if (data != NULL) { - MEM_freeN(data); - panel->activedata = NULL; + MEM_freeN(data); + panel->activedata = NULL; - WM_event_remove_ui_handler( - &win->modalhandlers, ui_handler_panel, ui_handler_remove_panel, panel, false); - } + WM_event_remove_ui_handler( + &win->modalhandlers, ui_handler_panel, ui_handler_remove_panel, panel, false); } else { if (!data) { |