Merge branch 'master' into blender2.8

[blender.git] / source / blender / editors / space_action / action_draw.c

diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index d82d38ac0eb2a157c230e0375688245523986c9d..feea9cf5b13d882c25eb67a59fc2d51a44235aaf 100644 (file)
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -277,7 +277,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                                {
                                                        FCurve *fcu = ale->data;
                                                        if (show_group_colors && fcu->grp && fcu->grp->customCol) {
-                                                               unsigned char *cp = fcu->grp->cs.active;
+                                                               unsigned char *cp = (unsigned char *)fcu->grp->cs.active;
                                                                
                                                                if (sel) immUniformColor4ub(cp[0], cp[1], cp[2], 0x65);
                                                                else immUniformColor4ub(cp[0], cp[1], cp[2], 0x0B);