From 3b23b5c638feae0ad6319440771b83a64a1f9ebe Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 19 May 2019 02:56:12 +0200 Subject: Images: don't (un)premultipy non-color data The previous behavior here was wrong for some specific combinations of settings, non-color RGB channels should never be affected by the alpha channel. --- source/blender/imbuf/intern/readimage.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index e1df5c63093..9297227bc87 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -49,8 +49,6 @@ static void imb_handle_alpha(ImBuf *ibuf, char colorspace[IM_MAX_SPACE], char effective_colorspace[IM_MAX_SPACE]) { - int alpha_flags; - if (colorspace) { if (ibuf->rect != NULL && ibuf->rect_float == NULL) { /* byte buffer is never internally converted to some standard space, @@ -62,6 +60,9 @@ static void imb_handle_alpha(ImBuf *ibuf, BLI_strncpy(colorspace, effective_colorspace, IM_MAX_SPACE); } + bool is_data = (colorspace && IMB_colormanagement_space_name_is_data(colorspace)); + int alpha_flags; + if (flags & IB_alphamode_detect) { alpha_flags = ibuf->flags & IB_alphamode_premul; } @@ -69,7 +70,10 @@ static void imb_handle_alpha(ImBuf *ibuf, alpha_flags = flags & IB_alphamode_premul; } - if (flags & IB_ignore_alpha) { + if (is_data) { + /* Don't touch alpha. */ + } + else if (flags & IB_ignore_alpha) { IMB_rectfill_alpha(ibuf, 1.0f); } else { -- cgit v1.2.3