blender
/
blender
127
395
Fork 565
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix first part of T44627, locking alpha should happen in straight space 

for float images or we get inconsistent premultiplied values.
This commit is contained in:
Antonis Ryakiotakis 2015-05-07 11:42:09 +02:00
parent 0e9b210595
commit 11cf1ebdd1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -4664,7 +4664,14 @@ static void *do_projectpaint_thread(void *ph_v)
}
if (lock_alpha) {
if (is_floatbuf) projPixel->pixel.f_pt[3] = projPixel->origColor.f_pt[3];
if (is_floatbuf) {
/* slightly more involved case since floats are in premultiplied space we need
* to make sure alpha is consistent, see T44627 */
float rgb_straight[4];
premul_to_straight_v4_v4(rgb_straight, projPixel->pixel.f_pt);
rgb_straight[3] = projPixel->origColor.f_pt[3];
straight_to_premul_v4_v4(projPixel->pixel.f_pt, rgb_straight);
}
else projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3];
}
@ -4833,7 +4840,14 @@ static void *do_projectpaint_thread(void *ph_v)
}
if (lock_alpha) {
if (is_floatbuf) projPixel->pixel.f_pt[3] = projPixel->origColor.f_pt[3];
if (is_floatbuf) {
/* slightly more involved case since floats are in premultiplied space we need
* to make sure alpha is consistent, see T44627 */
float rgb_straight[4];
premul_to_straight_v4_v4(rgb_straight, projPixel->pixel.f_pt);
rgb_straight[3] = projPixel->origColor.f_pt[3];
straight_to_premul_v4_v4(projPixel->pixel.f_pt, rgb_straight);
}
else projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3];
}