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/resources.c | |
| parent | f62b826533422e5de3b08601e5511c233deda529 (diff) | |
| parent | f74d85ffc8232a859b1419f5dc25b244ae04375f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 2 |
1 files changed, 1 insertions, 1 deletions
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]) |