diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 19:02:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 19:02:48 +0300 |
| commit | b49184b608df297195c5f0e81da4d8d9ddfb9213 (patch) | |
| tree | c2624887be563319a7138516d2fcc6100acdb2c6 /source/blender/editors/interface | |
| parent | f62b826533422e5de3b08601e5511c233deda529 (diff) | |
| parent | f74d85ffc8232a859b1419f5dc25b244ae04375f (diff) | |
Merge branch 'master' into blender2.8
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 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 9167bc43f4a..857ca0a9d96 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -4241,7 +4241,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 60f555a6188..b1cacdc5db6 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -987,7 +987,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; diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 602a88daa14..c78342a0713 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1549,7 +1549,7 @@ void UI_GetThemeColorBlendShade3ubv(int colorid1, int colorid2, float fac, int o blend[1] = offset + floorf((1.0f - fac) * cp1[1] + fac * cp2[1]); blend[2] = offset + floorf((1.0f - fac) * cp1[2] + fac * cp2[2]); - F3TOCHAR3(blend, col); + unit_float_to_uchar_clamp_v3(col, blend); } void UI_GetThemeColorShade4ubv(int colorid, int offset, unsigned char col[4]) |