diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-23 20:11:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-23 20:11:42 +0300 |
| commit | 08ca32093a9927d98a94212d822518e184f1fcdd (patch) | |
| tree | 20efe408ce26f2b3e47e98da510a94a02c36af3e /source/blender/editors/space_action | |
| parent | 181424152611aa7d842ece0265fb6c630c7a4d77 (diff) | |
| parent | 39577403d3c421f51735613810ffcb4acc1e3894 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/action_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index d82d38ac0eb..feea9cf5b13 100644 --- 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); |