Commit: 57660aac743a70eea0b917ae92dd5d6bdb1b12a9
Author: Campbell Barton
Date: Tue May 16 13:01:26 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB57660aac743a70eea0b917ae92dd5d6bdb1b12a9
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/space_node/node_draw.c
index a4ea4d2524c,6e25c87d274..fb94ce6e252
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@@ -886,28 -807,19 +886,20 @@@ static void node_draw_basis(const bCont
/* shadow */
node_draw_shadow(snode, node, BASIS_RAD, 1.0f);
- /* header uses color from backdrop, but we make it opaqie */
- if (color_id == TH_NODE) {
- float col[3];
- UI_GetThemeColorShade3fv(color_id, -20, col);
- glColor4f(col[0], col[1], col[2], 1.0f);
+ if (node->flag & NODE_MUTED) {
+ UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0,
color);
+ }
+ else {
+ /* 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);
+ }
}
- else
- UI_ThemeColor(color_id);
-
- if (node->flag & NODE_MUTED)
- UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
-
- #ifdef WITH_COMPOSITOR
- if (ntree->type == NTREE_COMPOSIT && (snode->flag &
SNODE_SHOW_HIGHLIGHT)) {
- if (COM_isHighlightedbNode(node)) {
- UI_GetThemeColorBlendShade4fv(color_id, TH_ACTIVE,
0.5f, 0, color);
- }
- }
- #endif
-
glLineWidth(1.0f);
UI_draw_roundbox_corner_set(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT);
@@@ -1037,22 -977,11 +1029,12 @@@ static void node_draw_hidden(const bCon
node_draw_shadow(snode, node, hiddenrad, 1.0f);
/* body */
- UI_ThemeColor(color_id);
if (node->flag & NODE_MUTED)
- UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f);
-
- UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad);
+ UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0,
color);
+ else
+ UI_GetThemeColor4fv(color_id, color);
-
- #ifdef WITH_COMPOSITOR
- if (ntree->type == NTREE_COMPOSIT && (snode->flag &
SNODE_SHOW_HIGHLIGHT)) {
- if (COM_isHighlightedbNode(node)) {
- UI_GetThemeColorBlendShade4fv(color_id, TH_ACTIVE,
0.5f, 0, color);
- }
- }
- #else
- (void)ntree;
- #endif
+
+ UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
hiddenrad, color);
/* outline active and selected emphasis */
if (node->flag & SELECT) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
