[Bf-blender-cvs] [8da253cfb64] master: Fix T101361: Collapsed multi-input sockets not collapsing noodles
Iliya Katueshenock
noreply at git.blender.org
Tue Sep 27 01:11:02 CEST 2022
Commit: 8da253cfb64fe578bd8136a7a0a4c4aa74fb536b
Author: Iliya Katueshenock
Date: Mon Sep 26 18:10:27 2022 -0500
Branches: master
https://developer.blender.org/rB8da253cfb64fe578bd8136a7a0a4c4aa74fb536b
Fix T101361: Collapsed multi-input sockets not collapsing noodles
Caused by 40d815dff651, which removed the check for "hidden" nodes.
Differential Revision: https://developer.blender.org/D16061
===================================================================
M source/blender/editors/space_node/drawnode.cc
===================================================================
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 0b11aa37981..13d13b10339 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -1588,7 +1588,7 @@ void draw_nodespace_back_pix(const bContext &C,
static float2 socket_link_connection_location(const bNodeSocket &socket, const bNodeLink &link)
{
const float2 socket_location(socket.locx, socket.locy);
- if (socket.flag & SOCK_MULTI_INPUT && socket.in_out == SOCK_IN) {
+ if (socket.is_multi_input() && socket.is_input() && !(socket.owner_node().flag & NODE_HIDDEN)) {
return node_link_calculate_multi_input_position(
socket_location, link.multi_input_socket_index, socket.total_inputs);
}
More information about the Bf-blender-cvs
mailing list