blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: improve readability for color assignment

This commit is contained in:
Campbell Barton 2020-05-01 14:58:58 +10:00
parent a6fbd4c9c8
commit ff1174e52c
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/brush.c
View File

@ -2055,7 +2055,7 @@ unsigned int *BKE_brush_gen_texture_cache(Brush *br, int half_side, bool use_sec
unsigned int *texcache = NULL;
MTex *mtex = (use_secondary) ? &br->mask_mtex : &br->mtex;
float intensity;
float rgba[4];
float rgba_dummy[4];
int ix, iy;
int side = half_side * 2;
@ -2073,11 +2073,8 @@ unsigned int *BKE_brush_gen_texture_cache(Brush *br, int half_side, bool use_sec
/* This is copied from displace modifier code */
/* TODO(sergey): brush are always caching with CM enabled for now. */
RE_texture_evaluate(mtex, co, 0, NULL, false, false, &intensity, rgba);
((char *)texcache)[(iy * side + ix) * 4] = ((char *)texcache)[(iy * side + ix) * 4 + 1] =
((char *)texcache)[(iy * side + ix) * 4 + 2] = ((
char *)texcache)[(iy * side + ix) * 4 + 3] = (char)(intensity * 255.0f);
RE_texture_evaluate(mtex, co, 0, NULL, false, false, &intensity, rgba_dummy);
copy_v4_uchar((uchar *)&texcache[iy * side + ix], (char)(intensity * 255.0f));
}
}
}

5
source/blender/blenlib/BLI_math_vector.h
View File

@ -62,6 +62,11 @@ MINLINE void swap_v4_v4(float a[4], float b[4]);
MINLINE void copy_v2_v2_uchar(unsigned char r[2], const unsigned char a[2]);
MINLINE void copy_v3_v3_uchar(unsigned char r[3], const unsigned char a[3]);
MINLINE void copy_v4_v4_uchar(unsigned char r[4], const unsigned char a[4]);
MINLINE void copy_v2_uchar(unsigned char r[2], unsigned char a);
MINLINE void copy_v3_uchar(unsigned char r[3], unsigned char a);
MINLINE void copy_v4_uchar(unsigned char r[4], unsigned char a);
/* char */
MINLINE void copy_v2_v2_char(char r[2], const char a[2]);
MINLINE void copy_v3_v3_char(char r[3], const char a[3]);

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

@ -123,6 +123,27 @@ MINLINE void copy_v4_v4_uchar(unsigned char r[4], const unsigned char a[4])
r[3] = a[3];
}
MINLINE void copy_v2_uchar(unsigned char r[2], const unsigned char a)
{
r[0] = a;
r[1] = a;
}
MINLINE void copy_v3_uchar(unsigned char r[3], const unsigned char a)
{
r[0] = a;
r[1] = a;
r[2] = a;
}
MINLINE void copy_v4_uchar(unsigned char r[4], const unsigned char a)
{
r[0] = a;
r[1] = a;
r[2] = a;
r[3] = a;
}
/* char */
MINLINE void copy_v2_v2_char(char r[2], const char a[2])
{