Merge branch 'master' into blender2.8

diff --cc intern/cycles/blender/addon/ui.py
Simple merge

diff --cc source/blender/editors/space_action/action_draw.c
index d82d38ac0eb2a157c230e0375688245523986c9d,0764f586de98380fe7b75323c14b3409155892c7..feea9cf5b13d882c25eb67a59fc2d51a44235aaf
--- 1/source/blender/editors/space_action/action_draw.c
--- 2/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@@ -277,14 -270,14 +277,14 @@@ void draw_channel_strips(bAnimContext *
                                                {
                                                        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) glColor4ub(cp[0], cp[1], cp[2], 0x65);
 -                                                              else glColor4ub(cp[0], cp[1], cp[2], 0x0B);
 +                                                              if (sel) immUniformColor4ub(cp[0], cp[1], cp[2], 0x65);
 +                                                              else immUniformColor4ub(cp[0], cp[1], cp[2], 0x0B);
                                                        }
                                                        else {
 -                                                              if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
 -                                                              else glColor4ub(col2[0], col2[1], col2[2], 0x22);
 +                                                              if (sel) immUniformColor4ub(col1[0], col1[1], col1[2], 0x22);
 +                                                              else immUniformColor4ub(col2[0], col2[1], col2[2], 0x22);
                                                        }
                                                        break;
                                                }