diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_ui.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index d637e011777..5179c4e538a 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -180,6 +180,17 @@ static void panel_draw_header_preset(const bContext *C, Panel *panel) RNA_parameter_list_free(&list); } +static void remove_panel_type_recursive(Panel *panel, const PanelType *pt) +{ + if (panel->type == pt) { + panel->type = NULL; + } + + LISTBASE_FOREACH (Panel *, child_panel, &panel->children) { + remove_panel_type_recursive(child_panel, pt); + } +} + static void rna_Panel_unregister(Main *bmain, StructRNA *type) { ARegionType *art; @@ -220,9 +231,7 @@ static void rna_Panel_unregister(Main *bmain, StructRNA *type) LISTBASE_FOREACH (ARegion *, region, regionbase) { if (region->type == art) { LISTBASE_FOREACH (Panel *, panel, ®ion->panels) { - if (panel->type == pt) { - panel->type = NULL; - } + remove_panel_type_recursive(panel, pt); } } /* The unregistered panel might have had a template that added instanced panels, |