Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Edge <bbbooo3>2022-06-23 20:22:23 +0300
committerHans Goudey <h.goudey@me.com>2022-06-23 20:22:23 +0300
commit56435b3268bceaf24c13336976c84a91a33f9283 (patch)
treeca4ff59d58db29a6a4fd8a77bab9ed2264c325f1 /source/blender/editors/space_node/node_draw.cc
parent792bf82f11a57c36734ef16b48137eda87a942cd (diff)
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
Diffstat (limited to 'source/blender/editors/space_node/node_draw.cc')
-rw-r--r--source/blender/editors/space_node/node_draw.cc11
1 files changed, 5 insertions, 6 deletions
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,