1 files changed, 11 insertions, 12 deletions

diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index 75eeb125609..52287b07b28 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -81,7 +81,7 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *region)
   v2d->tot.ymin = -height;
 
   /* need to do a view-sync here, so that the keys area doesn't jump around (it must copy this) */
-  UI_view2d_sync(NULL, ac->sa, v2d, V2D_LOCK_COPY);
+  UI_view2d_sync(NULL, ac->area, v2d, V2D_LOCK_COPY);
 
   /* loop through channels, and set up drawing depending on their type  */
   { /* first pass: just the standard GL-drawing for backdrop + text */
@@ -141,9 +141,9 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region
   bDopeSheet *ads = &saction->ads;
   AnimData *adt = NULL;
 
-  unsigned char col1[4], col2[4];
-  unsigned char col1a[4], col2a[4];
-  unsigned char col1b[4], col2b[4];
+  uchar col1[4], col2[4];
+  uchar col1a[4], col2a[4];
+  uchar col1b[4], col2b[4];
 
   const bool show_group_colors = !(saction->flag & SACTION_NODRAWGCOLORS);
 
@@ -212,10 +212,10 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region
               bActionGroup *agrp = ale->data;
               if (show_group_colors && agrp->customCol) {
                 if (sel) {
-                  immUniformColor3ubvAlpha((unsigned char *)agrp->cs.select, col1a[3]);
+                  immUniformColor3ubvAlpha((uchar *)agrp->cs.select, col1a[3]);
                 }
                 else {
-                  immUniformColor3ubvAlpha((unsigned char *)agrp->cs.solid, col2a[3]);
+                  immUniformColor3ubvAlpha((uchar *)agrp->cs.solid, col2a[3]);
                 }
               }
               else {
@@ -226,8 +226,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region
             case ANIMTYPE_FCURVE: {
               FCurve *fcu = ale->data;
               if (show_group_colors && fcu->grp && fcu->grp->customCol) {
-                immUniformColor3ubvAlpha((unsigned char *)fcu->grp->cs.active,
-                                         sel ? col1[3] : col2[3]);
+                immUniformColor3ubvAlpha((uchar *)fcu->grp->cs.active, sel ? col1[3] : col2[3]);
               }
               else {
                 immUniformColor4ubv(sel ? col1 : col2);
@@ -243,8 +242,8 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region
           immRectf(pos, v2d->cur.xmin, ymin, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymax);
         }
         else if (ac->datatype == ANIMCONT_GPENCIL) {
-          unsigned char *color;
-          unsigned char gpl_col[4];
+          uchar *color;
+          uchar gpl_col[4];
           if ((show_group_colors) && (ale->type == ANIMTYPE_GPLAYER)) {
             bGPDlayer *gpl = (bGPDlayer *)ale->data;
             rgb_float_to_uchar(gpl_col, gpl->color);
@@ -266,7 +265,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region
         else if (ac->datatype == ANIMCONT_MASK) {
           /* TODO --- this is a copy of gpencil */
           /* frames less than one get less saturated background */
-          unsigned char *color = sel ? col1 : col2;
+          uchar *color = sel ? col1 : col2;
           immUniformColor4ubv(color);
           immRectf(pos, 0.0f, ymin, v2d->cur.xmin, ymax);
 
@@ -562,7 +561,7 @@ void timeline_draw_cache(SpaceAction *saction, Object *ob, Scene *scene)
   /* Iterate over pointcaches on the active object, and draw each one's range. */
   float y_offset = 0.0f;
   const float cache_draw_height = 4.0f * UI_DPI_FAC * U.pixelsize;
-  for (PTCacheID *pid = pidlist.first; pid; pid = pid->next) {
+  LISTBASE_FOREACH (PTCacheID *, pid, &pidlist) {
     if (timeline_cache_is_hidden_by_setting(saction, pid)) {
       continue;
     }