diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 17:11:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 17:14:03 +0300 |
| commit | 73b55a5508c6f3e9bb7b59d2d903ac584518eccc (patch) | |
| tree | d7fdb2fd47bf743d3a7bc6a5edfccbd25b8175dd /source/blender/draw/intern/draw_armature.c | |
| parent | 56b06ee83afba38099fb7affc260885a613a3779 (diff) | |
Cleanup: style, use braces for draw
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index a26313a1402..13d9be9825e 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -643,10 +643,10 @@ static bool set_pchan_color(short colCode, const int boneflag, const short const { if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) { uchar cp[4]; - if (constflag & PCHAN_HAS_TARGET) rgba_char_args_set((char *)cp, 255, 150, 0, 80); - else if (constflag & PCHAN_HAS_IK) rgba_char_args_set((char *)cp, 255, 255, 0, 80); - else if (constflag & PCHAN_HAS_SPLINEIK) rgba_char_args_set((char *)cp, 200, 255, 0, 80); - else if (constflag & PCHAN_HAS_CONST) rgba_char_args_set((char *)cp, 0, 255, 120, 80); + if (constflag & PCHAN_HAS_TARGET) { rgba_char_args_set((char *)cp, 255, 150, 0, 80); } + else if (constflag & PCHAN_HAS_IK) { rgba_char_args_set((char *)cp, 255, 255, 0, 80); } + else if (constflag & PCHAN_HAS_SPLINEIK) { rgba_char_args_set((char *)cp, 200, 255, 0, 80); } + else if (constflag & PCHAN_HAS_CONST) { rgba_char_args_set((char *)cp, 0, 255, 120, 80); } else { return false; } @@ -726,11 +726,11 @@ static bool set_pchan_color(short colCode, const int boneflag, const short const /* inner part in background color or constraint */ if ((constflag) && ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS))) { uchar cp[4]; - if (constflag & PCHAN_HAS_TARGET) rgba_char_args_set((char *)cp, 255, 150, 0, 255); - else if (constflag & PCHAN_HAS_IK) rgba_char_args_set((char *)cp, 255, 255, 0, 255); - else if (constflag & PCHAN_HAS_SPLINEIK) rgba_char_args_set((char *)cp, 200, 255, 0, 255); - else if (constflag & PCHAN_HAS_CONST) rgba_char_args_set((char *)cp, 0, 255, 120, 255); - else if (constflag) UI_GetThemeColor4ubv(TH_BONE_POSE, cp); /* PCHAN_HAS_ACTION */ + if (constflag & PCHAN_HAS_TARGET) { rgba_char_args_set((char *)cp, 255, 150, 0, 255); } + else if (constflag & PCHAN_HAS_IK) { rgba_char_args_set((char *)cp, 255, 255, 0, 255); } + else if (constflag & PCHAN_HAS_SPLINEIK) { rgba_char_args_set((char *)cp, 200, 255, 0, 255); } + else if (constflag & PCHAN_HAS_CONST) { rgba_char_args_set((char *)cp, 0, 255, 120, 255); } + else if (constflag) { UI_GetThemeColor4ubv(TH_BONE_POSE, cp); } /* PCHAN_HAS_ACTION */ rgb_uchar_to_float(fcolor, cp); } @@ -1656,7 +1656,9 @@ static void pchan_draw_ik_lines( while (parchan->parent) { segcount++; /* FIXME: revise the breaking conditions */ - if (segcount == data->chainlen || segcount > 255) break; /* 255 is weak */ + if (segcount == data->chainlen || segcount > 255) { + break; /* 255 is weak */ + } parchan = parchan->parent; } /* Only draw line in case our chain is more than one bone long! */ |