Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #34589. There was no space conversion being done between layers in

Browse Source 
different colour space when using the clone brush.
This commit is contained in:
Antony Riakiotakis
2013-03-11 18:11:07 +00:00
parent e6dcf9504e
commit 0a3382c8e0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1379,15 +1379,18 @@ static ProjPixel *project_paint_uvpixel_init(
} }
else { /* from char to float */ else { /* from char to float */
unsigned char rgba_ub[4]; unsigned char rgba_ub[4];
float rgba[4];
project_face_pixel(tf_other, ibuf_other, w, side, rgba_ub, NULL); project_face_pixel(tf_other, ibuf_other, w, side, rgba_ub, NULL);
IMAPAINT_CHAR_RGBA_TO_FLOAT(((ProjPixelClone *)projPixel)->clonepx.f, rgba_ub); srgb_to_linearrgb_uchar4(rgba, rgba_ub);
straight_to_premul_v4_v4(((ProjPixelClone *)projPixel)->clonepx.f, rgba);
} }
} }
else { else {
if (ibuf_other->rect_float) { /* float to char */ if (ibuf_other->rect_float) { /* float to char */
float rgba[4]; float rgba[4];
project_face_pixel(tf_other, ibuf_other, w, side, NULL, rgba); project_face_pixel(tf_other, ibuf_other, w, side, NULL, rgba);
IMAPAINT_FLOAT_RGBA_TO_CHAR(((ProjPixelClone *)projPixel)->clonepx.ch, rgba); premul_to_straight_v4(rgba);
linearrgb_to_srgb_uchar3(((ProjPixelClone *)projPixel)->clonepx.ch, rgba);
} }
else { /* char to char */ else { /* char to char */
project_face_pixel(tf_other, ibuf_other, w, side, ((ProjPixelClone *)projPixel)->clonepx.ch, NULL); project_face_pixel(tf_other, ibuf_other, w, side, ((ProjPixelClone *)projPixel)->clonepx.ch, NULL);