[Bf-blender-cvs] [08ca32093a] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 08ca32093a9927d98a94212d822518e184f1fcdd
Author: Sergey Sharybin
Date:   Mon Jan 23 18:11:42 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB08ca32093a9927d98a94212d822518e184f1fcdd

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/space_action/action_draw.c
index d82d38ac0e,0764f586de..feea9cf5b1
--- 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;
  						}