[Bf-blender-cvs] [44d47526af7] blender2.8: Fix icon alpha theme option not working for monochrome icons.

Brecht Van Lommel noreply at git.blender.org
Wed Oct 3 12:57:19 CEST 2018


Commit: 44d47526af771ce3434950441aa449a6d6eeb9d3
Author: Brecht Van Lommel
Date:   Tue Oct 2 16:04:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB44d47526af771ce3434950441aa449a6d6eeb9d3

Fix icon alpha theme option not working for monochrome icons.

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

M	source/blender/editors/interface/interface_icons.c

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

diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 70e9a25d086..162687c64ff 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1536,7 +1536,8 @@ static void icon_draw_size(
 		if (rgb) {
 			mul_v3_v3(color, rgb);
 		}
-		color[3] *= alpha;
+
+		mul_v4_fl(color, alpha);
 
 		GPU_blend_set_func(GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
 		icon_draw_texture(x, y, (float)w, (float)h, di->data.texture.x, di->data.texture.y,



More information about the Bf-blender-cvs mailing list