[Bf-blender-cvs] [a1bd25af729] master: Node headers should not respect theme alpha values

Sebastian Parborg noreply at git.blender.org
Wed Feb 20 14:37:38 CET 2019


Commit: a1bd25af729a35a88531c4b9e340e3c48be23884
Author: Sebastian Parborg
Date:   Wed Feb 20 14:35:27 2019 +0100
Branches: master
https://developer.blender.org/rBa1bd25af729a35a88531c4b9e340e3c48be23884

Node headers should not respect theme alpha values

As pointed out in https://developer.blender.org/rB558d7dd90e56ca1b4dbf1b7b8b7b555791821148,
the theme color alpha should not be taken into account when rendering node headers.

Reviewed By: Brecht Van Lommel

Differential Revision: https://developer.blender.org/D4338

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

M	source/blender/editors/space_node/node_draw.c

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

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index c3de05ec355..ed1db0e6fae 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -893,11 +893,11 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		/* header uses color from backdrop, but we make it opaque */
 		if (color_id == TH_NODE) {
 			UI_GetThemeColorShade3fv(color_id, -20, color);
-			color[3] = 1.0f;
 		}
 		else {
-			UI_GetThemeColor4fv(color_id, color);
+			UI_GetThemeColor3fv(color_id, color);
 		}
+		color[3] = 1.0f;
 	}
 
 	GPU_line_width(1.0f);



More information about the Bf-blender-cvs mailing list