source/blender/editors/animation/fmodifier_ui.c

@@ -208,11 +208,7 @@ static PanelType *fmodifier_subpanel_register(ARegionType *region_type,
   panel_type->poll = poll;
   panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
 
-  BLI_assert(parent != NULL);
-  BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
-  panel_type->parent = parent;
-  BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
-  BLI_addtail(&region_type->paneltypes, panel_type);
+  WM_paneltype_subpanel_add(parent,pt, true);
 
   return panel_type;
 }

source/blender/editors/space_nla/nla_buttons.c

@@ -665,12 +665,11 @@ void nla_buttons_register(ARegionType *art)
   strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
   pt->draw = nla_panel_evaluation;
   pt->draw_header = nla_panel_animated_influence_header;
-  pt->parent = pt_properties;
   pt->flag = PANEL_TYPE_DEFAULT_CLOSED;
   pt->poll = nla_strip_eval_panel_poll;
-  BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
+  WM_paneltype_subpanel_add(pt_properties, pt, true);
   BLI_addtail(&art->paneltypes, pt);
-
+  
   pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel animated strip time");
   strcpy(pt->idname, "NLA_PT_animated_strip_time");
   strcpy(pt->parent_id, "NLA_PT_properties");
@@ -679,12 +678,10 @@ void nla_buttons_register(ARegionType *art)
   strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
   pt->draw = nla_panel_animated_strip_time;
   pt->draw_header = nla_panel_animated_strip_time_header;
-  pt->parent = pt_properties;
   pt->flag = PANEL_TYPE_DEFAULT_CLOSED;
   pt->poll = nla_strip_eval_panel_poll;
-  BLI_addtail(&pt_properties->children, BLI_genericNodeN(pt));
+  WM_paneltype_subpanel_add(pt_properties, pt, true); 
   BLI_addtail(&art->paneltypes, pt);
-
   pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel modifiers");
   strcpy(pt->idname, "NLA_PT_modifiers");
   strcpy(pt->label, N_("Modifiers"));

source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c

@@ -391,11 +391,7 @@ PanelType *gpencil_modifier_subpanel_register(ARegionType *region_type,
   panel_type->poll = gpencil_modifier_ui_poll;
   panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
 
-  BLI_assert(parent != NULL);
-  BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
-  panel_type->parent = parent;
-  BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
-  BLI_addtail(&region_type->paneltypes, panel_type);
+  WM_paneltype_subpanel_add(parent, pt, true);
 
   return panel_type;
 }

source/blender/makesrna/intern/rna_ui.c

@@ -389,19 +389,9 @@ static StructRNA *rna_Panel_register(Main *bmain,
   }
 
   /* Insert into list. */
-  BLI_insertlinkafter(&art->paneltypes, pt_iter, pt);
+   BLI_insertlinkafter(&art->paneltypes, pt_iter, pt);
 
-  if (parent) {
-    pt->parent = parent;
-    LinkData *pt_child_iter = parent->children.last;
-    for (; pt_child_iter; pt_child_iter = pt_child_iter->prev) {
-      PanelType *pt_child = pt_child_iter->data;
-      if (pt_child->order <= pt->order) {
-        break;
-      }
-    }
-    BLI_insertlinkafter(&parent->children, pt_child_iter, BLI_genericNodeN(pt));
-  }
+   WM_paneltype_subpanel_add(parent, pt, true);
 
   {
     const char *owner_id = RNA_struct_state_owner_get();
@@ -410,7 +400,9 @@ static StructRNA *rna_Panel_register(Main *bmain,
     }
   }
 
-  WM_paneltype_add(pt);
+  WM_paneltype_add(pt); 
+
+  
 
   /* update while blender is running */
   WM_main_add_notifier(NC_WINDOW, NULL);

source/blender/modifiers/intern/MOD_ui_common.c

@@ -483,11 +483,7 @@ PanelType *modifier_subpanel_register(ARegionType *region_type,
   panel_type->poll = modifier_ui_poll;
   panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
 
-  BLI_assert(parent != NULL);
-  BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
-  panel_type->parent = parent;
-  BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
-  BLI_addtail(&region_type->paneltypes, panel_type);
+  WM_paneltype_subpanel_add(parent, pt, true);
 
   return panel_type;
 }

source/blender/shader_fx/intern/FX_ui_common.c

@@ -262,11 +262,7 @@ PanelType *shaderfx_subpanel_register(ARegionType *region_type,
   panel_type->poll = shaderfx_ui_poll;
   panel_type->flag = PANEL_TYPE_DEFAULT_CLOSED;
 
-  BLI_assert(parent != NULL);
-  BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME);
-  panel_type->parent = parent;
-  BLI_addtail(&parent->children, BLI_genericNodeN(panel_type));
-  BLI_addtail(&region_type->paneltypes, panel_type);
+  WM_paneltype_subpanel_add(parent, pt, true);
 
   return panel_type;
 }

source/blender/windowmanager/WM_api.h

@@ -1154,6 +1154,7 @@ void WM_paneltype_init(void);
 void WM_paneltype_clear(void);
 struct PanelType *WM_paneltype_find(const char *idname, bool quiet);
 bool WM_paneltype_add(struct PanelType *pt);
+void WM_paneltype_subpanel_add(PanelType *pt, PanelType *parent, bool use_order);
 void WM_paneltype_remove(struct PanelType *pt);
 
 void WM_paneltype_idname_visit_for_search(const struct bContext *C,

source/blender/windowmanager/intern/wm_panel_type.c

@@ -47,6 +47,27 @@ bool WM_paneltype_add(PanelType *pt)
   return true;
 }
 
+void WM_paneltype_subpanel_add(PanelType *pt, PanelType *parent, bool use_order)
+{
+  pt->parent = parent;
+
+  if (parent) {
+    if (use_order) {
+      LinkData *pt_child_iter = parent->children.last;
+      for (; pt_child_iter; pt_child_iter = pt_child_iter->prev) {
+        PanelType *pt_child = pt_child_iter->data;
+        if (pt_child->order <= pt->order) {
+          break;
+        }
+      }
+      BLI_insertlinkafter(&parent->children, pt_child_iter, BLI_genericNodeN(pt));
+    }
+    else {
+      BLI_addtail(&parent->children, BLI_genericNodeN(pt));
+    }
+  }
+}
+
 void WM_paneltype_remove(PanelType *pt)
 {
   const bool ok = BLI_ghash_remove(g_paneltypes_hash, pt->idname, NULL, NULL);

source/tools

@@ -1 +1 @@
-Subproject commit e133fc08cd3254bb3d3bd1345028c8486700bca4
+Subproject commit 27826b4aed138b7e3aed882d0eab96740c3a55c7