Commit: 7b8810b01a2f378a45874da6676eaccf7c0b9626
Author: Sergey Sharybin
Date: Mon Jan 23 11:46:02 2017 +0100
Branches: master
https://developer.blender.org/rB7b8810b01a2f378a45874da6676eaccf7c0b9626
Silence strict compiler warnings
Similar thing to other areas where we mix Blender's char with OpenGL API.
===================================================================
M source/blender/editors/space_action/action_draw.c
===================================================================
diff --git a/source/blender/editors/space_action/action_draw.c
b/source/blender/editors/space_action/action_draw.c
index 7c9228e1fa..0764f586de 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -252,11 +252,11 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction
*saction, ARegion *ar)
bActionGroup *agrp =
ale->data;
if (show_group_colors
&& agrp->customCol) {
if (sel) {
-
unsigned char *cp = agrp->cs.select;
+
unsigned char *cp = (unsigned char *)agrp->cs.select;
glColor4ub(cp[0], cp[1], cp[2], 0x45);
}
else {
-
unsigned char *cp = agrp->cs.solid;
+
unsigned char *cp = (unsigned char *)agrp->cs.solid;
glColor4ub(cp[0], cp[1], cp[2], 0x1D);
}
}
@@ -270,7 +270,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)
glColor4ub(cp[0], cp[1], cp[2], 0x65);
else
glColor4ub(cp[0], cp[1], cp[2], 0x0B);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
