From a20e703d1a5cc0d3e4294825e31609d9b92da06d Mon Sep 17 00:00:00 2001 From: Omar Emara Date: Fri, 19 Nov 2021 15:55:58 +0200 Subject: Fix T93184: Link color not used for custom sockets D13044 allowed the link color overlay to be used with custom sockets. This no longer works due to a condition that checks if the socket is standard or not, which was in place to avoid bad indexing of the std_node_socket_colors array. Since that array is no longer used, this condition needs to be removed. Differential Revision: https://developer.blender.org/D13274 Reviewed By: Hans Goudey --- source/blender/editors/space_node/drawnode.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to '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 d903e9ee984..57fecba76f7 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -4313,9 +4313,7 @@ void node_draw_link_bezier(const bContext *C, } if (snode->overlay.flag & SN_OVERLAY_SHOW_OVERLAYS && - snode->overlay.flag & SN_OVERLAY_SHOW_WIRE_COLORS && - ((link->fromsock == nullptr || link->fromsock->typeinfo->type >= 0) && - (link->tosock == nullptr || link->tosock->typeinfo->type >= 0))) { + snode->overlay.flag & SN_OVERLAY_SHOW_WIRE_COLORS) { PointerRNA from_node_ptr, to_node_ptr; RNA_pointer_create((ID *)snode->edittree, &RNA_Node, link->fromnode, &from_node_ptr); RNA_pointer_create((ID *)snode->edittree, &RNA_Node, link->tonode, &to_node_ptr); -- cgit v1.2.3