blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Property Search: Don't set expansion for panels in inactive tabs 

The search should check if a panel is active before changing its
expansion, otherwise it sets the expansion for all of the region's
panels, even invisible ones in other tabs.
This commit is contained in:
Hans Goudey 2020-09-18 16:39:43 -05:00
parent ea72c5d69b
commit a0a536bbff
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/interface/interface_panel.c
View File

@ -854,10 +854,11 @@ static void panel_set_expansion_from_seach_filter_recursive(const bContext *C, P
/* If the panel is filtered (removed) we need to check that its children are too. */
LISTBASE_FOREACH (Panel *, child_panel, &panel->children) {
if (panel->type == NULL || (panel->type->flag & PNL_NO_HEADER)) {
continue;
if (panel->runtime_flag & PANEL_ACTIVE) {
if (!(panel->type->flag & PNL_NO_HEADER)) {
panel_set_expansion_from_seach_filter_recursive(C, child_panel);
}
}
panel_set_expansion_from_seach_filter_recursive(C, child_panel);
}
}
@ -868,10 +869,11 @@ static void panel_set_expansion_from_seach_filter_recursive(const bContext *C, P
void UI_panels_set_expansion_from_seach_filter(const bContext *C, ARegion *region)
{
LISTBASE_FOREACH (Panel *, panel, &region->panels) {
if (panel->type == NULL || (panel->type->flag & PNL_NO_HEADER)) {
continue;
if (panel->runtime_flag & PANEL_ACTIVE) {
if (!(panel->type->flag & PNL_NO_HEADER)) {
panel_set_expansion_from_seach_filter_recursive(C, panel);
}
}
panel_set_expansion_from_seach_filter_recursive(C, panel);
}
}