diff options
author | Omar Emara <mail@OmarEmara.dev> | 2021-11-19 16:55:58 +0300 |
---|---|---|
committer | Omar Emara <mail@OmarEmara.dev> | 2021-11-19 16:55:58 +0300 |
commit | a20e703d1a5cc0d3e4294825e31609d9b92da06d (patch) | |
tree | 0bdb45ac7f3383b5fa3cd94ea416b1b9159279fb | |
parent | fa6a913ef19c7b269dba82141db1df5d712be1a7 (diff) |
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
-rw-r--r-- | source/blender/editors/space_node/drawnode.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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); |