Fix T60415: wrong font preview image alpha blending.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 11 Jan 2019 16:00:03 +0000 (17:00 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 11 Jan 2019 16:26:54 +0000 (17:26 +0100)
source/blender/editors/space_file/file_draw.c

index 4b2486f..93e1070 100644 (file)
@@ -391,8 +391,10 @@ static void file_draw_preview(
                UI_GetThemeColor4fv(TH_TEXT, col);
        }
 
-       /* Preview images use premultiplied alpha. */
-       GPU_blend_set_func_separate(GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
+       if (!is_icon && typeflags & FILE_TYPE_BLENDERLIB) {
+               /* Datablock preview images use premultiplied alpha. */
+               GPU_blend_set_func_separate(GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
+       }
 
        IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR);
        immDrawPixelsTexScaled(&state, (float)xco, (float)yco, imb->x, imb->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, imb->rect,