diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 18:31:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 18:51:40 +0300 |
commit | f74d85ffc8232a859b1419f5dc25b244ae04375f (patch) | |
tree | f74928d7681488c044ea65249eaaa5b6900d246b /source/blender/editors/interface | |
parent | 905eeb0bc7f46efb95cb5450cc6c2ec27f02730c (diff) |
Cleanup: rename char/float conversion functions
- FTOCHAR -> unit_float_to_uchar_clamp
- F3TOCHAR3 -> unit_float_to_uchar_clamp_v3 (swap args)
- F4TOCHAR4 -> unit_float_to_uchar_clamp_v4 (swap args)
- FTOUSHORT -> unit_float_to_ushort_clamp
- USHORTTOUCHAR -> unit_ushort_to_uchar
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index b92216138fd..5431f210441 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -3847,7 +3847,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C) but = uiDefBut(block, UI_BTYPE_ROUNDBOX, 0, "", UI_UNIT_X + 10, 0, UI_UNIT_X + width, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, ""); - but->col[0] = but->col[1] = but->col[2] = FTOCHAR(rti->grayscale); + but->col[0] = but->col[1] = but->col[2] = unit_float_to_uchar_clamp(rti->grayscale); but->col[3] = 255; UI_block_align_end(block); diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index f1f193f1b02..8c868b81239 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -635,7 +635,7 @@ static void shadecolors4(char coltop[4], char coldown[4], const char *color, sho static void round_box_shade_col4_r(unsigned char r_col[4], const char col1[4], const char col2[4], const float fac) { - const int faci = FTOCHAR(fac); + const int faci = unit_float_to_uchar_clamp(fac); const int facm = 255 - faci; r_col[0] = (faci * col1[0] + facm * col2[0]) / 256; |