archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: support 3 digit hex colors like HTML, e.g. #123 becomes #112233.

Browse Source 
Patch #35359 by Forest Ka.
This commit is contained in:
Brecht Van Lommel
2013-05-30 09:48:17 +00:00
parent cf5e979fb4
commit fe76c06b30
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/blenlib/intern/math_color.c
View File

@@ -197,17 +197,26 @@ void hex_to_rgb(char *hexcol, float *r, float *g, float *b)
if (hexcol[0] == '#') hexcol++;
if (sscanf(hexcol, "%02x%02x%02x", &ri, &gi, &bi) == 3) {
*r = ri * (1.0f / 255.0f);
*g = gi * (1.0f / 255.0f);
*b = bi * (1.0f / 255.0f);
CLAMP(*r, 0.0f, 1.0f);
CLAMP(*g, 0.0f, 1.0f);
CLAMP(*b, 0.0f, 1.0f);
/* six digit hex colors */
}
else if (sscanf(hexcol, "%01x%01x%01x", &ri, &gi, &bi) == 3) {
/* three digit hex colors (#123 becomes #112233) */
ri += ri << 4;
gi += gi << 4;
bi += bi << 4;
}
else {
/* avoid using un-initialized vars */
*r = *g = *b = 0.0f;
return;
}
*r = ri * (1.0f / 255.0f);
*g = gi * (1.0f / 255.0f);
*b = bi * (1.0f / 255.0f);
CLAMP(*r, 0.0f, 1.0f);
CLAMP(*g, 0.0f, 1.0f);
CLAMP(*b, 0.0f, 1.0f);
}
void rgb_to_hsv(float r, float g, float b, float *lh, float *ls, float *lv)