diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-04 16:00:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-04 16:00:11 +0400 |
| commit | b9076b87d28a741e09bd7da66bf9d1a1fe07c38d (patch) | |
| tree | b29486893b7f4b844355c2cd82a2fd8f10dbb7fa /source/blender/editors/space_view3d/drawarmature.c | |
| parent | 5a0dca41e5aed566ce6427c863c2f3072f7d044c (diff) | |
pass colors to glColor as vectors where possible.
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 022fa8b64c3..7c66cec5730 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -129,7 +129,7 @@ static void set_pchan_colorset (Object *ob, bPoseChannel *pchan) } /* This function is for brightening/darkening a given color (like UI_ThemeColorShade()) */ -static void cp_shade_color3ub (char cp[], int offset) +static void cp_shade_color3ub (unsigned char cp[3], const int offset) { int r, g, b; @@ -152,7 +152,7 @@ static short set_pchan_glColor (short colCode, int boneflag, int constflag) case PCHAN_COLOR_NORMAL: { if (bcolor) { - char cp[3]; + unsigned char cp[3]; if (boneflag & BONE_DRAW_ACTIVE) { VECCOPY(cp, bcolor->active); @@ -169,7 +169,7 @@ static short set_pchan_glColor (short colCode, int boneflag, int constflag) cp_shade_color3ub(cp, -50); } - glColor3ub(cp[0], cp[1], cp[2]); + glColor3ubv(cp); } else { if (boneflag & BONE_DRAW_ACTIVE && boneflag & BONE_SELECTED) UI_ThemeColorShade(TH_BONE_POSE, 40); @@ -185,8 +185,7 @@ static short set_pchan_glColor (short colCode, int boneflag, int constflag) case PCHAN_COLOR_SOLID: { if (bcolor) { - char *cp= bcolor->solid; - glColor3ub(cp[0], cp[1], cp[2]); + glColor3ubv((unsigned char *)bcolor->solid); } else UI_ThemeColor(TH_BONE_SOLID); @@ -215,7 +214,7 @@ static short set_pchan_glColor (short colCode, int boneflag, int constflag) case PCHAN_COLOR_SPHEREBONE_BASE: { if (bcolor) { - char cp[3]; + unsigned char cp[3]; if (boneflag & BONE_DRAW_ACTIVE) { VECCOPY(cp, bcolor->active); @@ -227,7 +226,7 @@ static short set_pchan_glColor (short colCode, int boneflag, int constflag) VECCOPY(cp, bcolor->solid); } - glColor3ub(cp[0], cp[1], cp[2]); + glColor3ubv(cp); } else { if (boneflag & BONE_DRAW_ACTIVE) UI_ThemeColorShade(TH_BONE_POSE, 40); @@ -241,7 +240,7 @@ static short set_pchan_glColor (short colCode, int boneflag, int constflag) case PCHAN_COLOR_SPHEREBONE_END: { if (bcolor) { - char cp[3]; + unsigned char cp[3]; if (boneflag & BONE_DRAW_ACTIVE) { VECCOPY(cp, bcolor->active); @@ -256,7 +255,7 @@ static short set_pchan_glColor (short colCode, int boneflag, int constflag) cp_shade_color3ub(cp, -30); } - glColor3ub(cp[0], cp[1], cp[2]); + glColor3ubv(cp); } else { if (boneflag & BONE_DRAW_ACTIVE) UI_ThemeColorShade(TH_BONE_POSE, 10); |