From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 23 Jan 2017 17:11:42 +0000 (+0100)
Subject: Merge branch 'master' into blender2.8
X-Git-Tag: v2.80-rc1~16780
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commitdiff_plain/08ca32093a9927d98a94212d822518e184f1fcdd

Merge branch 'master' into blender2.8
---

08ca32093a9927d98a94212d822518e184f1fcdd
diff --cc source/blender/editors/space_action/action_draw.c
index d82d38ac0eb,0764f586de9..feea9cf5b13
--- a/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;
  						}