[Bf-blender-cvs] [5aca73e7749] master: Fix header text for muted collapsed nodes not being greyed out.

Brecht Van Lommel noreply at git.blender.org
Fri Mar 29 17:57:02 CET 2019


Commit: 5aca73e77490c6d6f6c9dc842080360436da5754
Author: Brecht Van Lommel
Date:   Fri Mar 29 15:51:36 2019 +0100
Branches: master
https://developer.blender.org/rB5aca73e77490c6d6f6c9dc842080360436da5754

Fix header text for muted collapsed nodes not being greyed out.

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

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 06431d3def8..4720feba4ed 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1176,10 +1176,13 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 		//if (node->flag & NODE_MUTED)
 		//	BLI_snprintf(showname, sizeof(showname), "[%s]", showname);
 
-		uiDefBut(node->block, UI_BTYPE_LABEL, 0, showname,
-		         round_fl_to_int(rct->xmin + NODE_MARGIN_X), round_fl_to_int(centy - NODE_DY * 0.5f),
-		         (short)(BLI_rctf_size_x(rct) - 18.0f - 12.0f), (short)NODE_DY,
-		         NULL, 0, 0, 0, 0, "");
+		uiBut *but = uiDefBut(node->block, UI_BTYPE_LABEL, 0, showname,
+		                      round_fl_to_int(rct->xmin + NODE_MARGIN_X), round_fl_to_int(centy - NODE_DY * 0.5f),
+		                      (short)(BLI_rctf_size_x(rct) - 18.0f - 12.0f), (short)NODE_DY,
+		                      NULL, 0, 0, 0, 0, "");
+		if (node->flag & NODE_MUTED) {
+			UI_but_flag_enable(but, UI_BUT_INACTIVE);
+		}
 	}
 
 	/* scale widget thing */



More information about the Bf-blender-cvs mailing list