[Bf-blender-cvs] [56435b3268b] master: Fix T94621: Missing selection indication for virtual node sockets
Max Edge
noreply at git.blender.org
Thu Jun 23 19:22:41 CEST 2022
Commit: 56435b3268bceaf24c13336976c84a91a33f9283
Author: Max Edge
Date: Thu Jun 23 12:22:23 2022 -0500
Branches: master
https://developer.blender.org/rB56435b3268bceaf24c13336976c84a91a33f9283
Fix T94621: Missing selection indication for virtual node sockets
A small regression as a result of adding a custom outline to the empty
virtual socket, which ended up overriding the colors when selected with
Shift+LMB.
Differential Revision: https://developer.blender.org/D15103
===================================================================
M source/blender/editors/space_node/node_draw.cc
===================================================================
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 7003d51b2b6..b879219e39c 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -749,15 +749,14 @@ static void node_socket_outline_color_get(const bool selected,
if (selected) {
UI_GetThemeColor4fv(TH_ACTIVE, r_outline_color);
}
+ else if (socket_type == SOCK_CUSTOM) {
+ /* Until there is a better place for per socket color,
+ * the outline color for virtual sockets is set here. */
+ copy_v4_v4(r_outline_color, virtual_node_socket_outline_color);
+ }
else {
UI_GetThemeColor4fv(TH_WIRE, r_outline_color);
}
-
- /* Until there is a better place for per socket color,
- * the outline color for virtual sockets is set here. */
- if (socket_type == SOCK_CUSTOM) {
- copy_v4_v4(r_outline_color, virtual_node_socket_outline_color);
- }
}
void node_socket_color_get(const bContext &C,
More information about the Bf-blender-cvs
mailing list