[Bf-blender-cvs] [6abbab5b539] master: Fix T60415: wrong font preview image alpha blending.

[Brecht Van Lommel]

Commit: 6abbab5b5396a84a8f3169135f5937d76d3dcb6f
Author: Brecht Van Lommel
Date:   Fri Jan 11 17:00:03 2019 +0100
Branches: master
https://developer.blender.org/rB6abbab5b5396a84a8f3169135f5937d76d3dcb6f

Fix T60415: wrong font preview image alpha blending.

===================================================================

M	source/blender/editors/space_file/file_draw.c

===================================================================

diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 4b2486f2a68..93e10704c0c 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -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,