UI: Drag and Drop FModifiers, Layout Updates

There are still problems
 - Context doesn't work in NLA editor
 - Lots of memory leaks for anim context.
   Should find a different method for getting the context that doesn't require a "free" every time.

This also adds support for regions with panel categories to the list panel system, which was a simple oversight.

Differential Revision: https://developer.blender.org/D7997

1 files changed, 9 insertions, 8 deletions

diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index 307b6d9bc21..3d48583dfc9 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -540,8 +540,7 @@ static void nla_panel_modifiers(const bContext *C, Panel *panel)
 {
   PointerRNA strip_ptr;
   NlaStrip *strip;
-  FModifier *fcm;
-  uiLayout *col, *row;
+  uiLayout *row;
   uiBlock *block;
 
   /* check context and also validity of pointer */
@@ -569,12 +568,7 @@ static void nla_panel_modifiers(const bContext *C, Panel *panel)
     uiItemO(row, "", ICON_PASTEDOWN, "NLA_OT_fmodifier_paste");
   }
 
-  /* draw each modifier */
-  for (fcm = strip->modifiers.first; fcm; fcm = fcm->next) {
-    col = uiLayoutColumn(panel->layout, true);
-
-    ANIM_uiTemplate_fmodifier_draw(col, strip_ptr.owner_id, &strip->modifiers, fcm);
-  }
+  ANIM_fmodifier_panels(C, &strip->modifiers);
 }
 
 /* ******************* general ******************************** */
@@ -658,4 +652,11 @@ void nla_buttons_register(ARegionType *art)
   pt->draw = nla_panel_modifiers;
   pt->poll = nla_strip_eval_panel_poll;
   BLI_addtail(&art->paneltypes, pt);
+
+  ANIM_fcm_generator_panel_register(art);
+  ANIM_fcm_fn_generator_panel_register(art);
+  ANIM_fcm_noise_panel_register(art);
+  ANIM_fcm_envelope_panel_register(art);
+  ANIM_fcm_limits_panel_register(art);
+  ANIM_fcm_stepped_panel_register(art);
 }