blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Use FTOCHAR rather than CLAMP of uchar output 

This makes no sense to clamp after value was assigned to uchar already.
Proper way to do so is to use FTOCHAR.
This commit is contained in:
Sergey Sharybin 2017-03-15 13:48:47 +01:00
parent 407f8eed7d
commit d4b3068f36
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/resources.c
View File

@ -1500,13 +1500,13 @@ void UI_GetThemeColorBlendShade3ubv(int colorid1, int colorid2, float fac, int o
cp2 = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid2);
CLAMP(fac, 0.0f, 1.0f);
col[0] = offset + floorf((1.0f - fac) * cp1[0] + fac * cp2[0]);
col[1] = offset + floorf((1.0f - fac) * cp1[1] + fac * cp2[1]);
col[2] = offset + floorf((1.0f - fac) * cp1[2] + fac * cp2[2]);
CLAMP(col[0], 0, 255);
CLAMP(col[1], 0, 255);
CLAMP(col[2], 0, 255);
float blend[3];
blend[0] = offset + floorf((1.0f - fac) * cp1[0] + fac * cp2[0]);
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);
}
void UI_GetThemeColorShade4ubv(int colorid, int offset, unsigned char col[4])