Commit: 181424152611aa7d842ece0265fb6c630c7a4d77 Author: Julian Eisel Date: Sun Jan 22 21:16:00 2017 +0100 Branches: blender2.8 https://developer.blender.org/rB181424152611aa7d842ece0265fb6c630c7a4d77
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_action/action_draw.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_action/action_draw.c
index df9c67b1f2,7c9228e1fa..d82d38ac0e
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@@ -254,8 -249,36 +256,36 @@@ void draw_channel_strips(bAnimContext *
}
case ANIMTYPE_GROUP:
{
- if (sel)
immUniformColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
- else
immUniformColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
+ bActionGroup *agrp =
ale->data;
+ if (show_group_colors
&& agrp->customCol) {
+ if (sel) {
+
unsigned char *cp = agrp->cs.select;
-
glColor4ub(cp[0], cp[1], cp[2], 0x45);
++
immUniformColor4ub(cp[0], cp[1], cp[2], 0x45);
+ }
+ else {
+
unsigned char *cp = agrp->cs.solid;
-
glColor4ub(cp[0], cp[1], cp[2], 0x1D);
++
immUniformColor4ub(cp[0], cp[1], cp[2], 0x1D);
+ }
+ }
+ else {
- if (sel)
glColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
- else
glColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
++ if (sel)
immUniformColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
++ else
immUniformColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
+ }
+ break;
+ }
+ case ANIMTYPE_FCURVE:
+ {
+ FCurve *fcu = ale->data;
+ if (show_group_colors
&& fcu->grp && fcu->grp->customCol) {
+ unsigned char
*cp = 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;
}
default:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
