Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-01-23 13:46:02 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-23 13:46:02 +0300
commit7b8810b01a2f378a45874da6676eaccf7c0b9626 (patch)
treeb826ed937399aefa8d655cb2831ffe7da33452d2
parent77982e159c7b34d82182b1391ad9afdfdace5e96 (diff)
Silence strict compiler warnings
Similar thing to other areas where we mix Blender's char with OpenGL API.
-rw-r--r--source/blender/editors/space_action/action_draw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index 7c9228e1fae..0764f586de9 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);