1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 740e45bc5e1..15e41d03583 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -106,7 +106,6 @@ static bNodeSocket *verify_socket_template(
     if (sock->type != stemp->type) {
       nodeModifySocketType(ntree, node, sock, stemp->type, stemp->subtype);
     }
-    sock->limit = (stemp->limit == 0 ? (in_out == SOCK_IN ? 1 : 0xFFF) : stemp->limit);
     sock->flag |= stemp->flag;
   }
   else {
@@ -430,6 +429,10 @@ static bNodeSocketType *make_standard_socket_type(int type, int subtype)
   stype->interface_from_socket = standard_node_socket_interface_from_socket;
   stype->interface_verify_socket = standard_node_socket_interface_verify_socket;
 
+  stype->use_link_limits_of_type = true;
+  stype->input_link_limit = 1;
+  stype->output_link_limit = 0xFFF;
+
   return stype;
 }
 
@@ -457,6 +460,10 @@ static bNodeSocketType *make_socket_type_virtual(void)
 
   ED_init_node_socket_type_virtual(stype);
 
+  stype->use_link_limits_of_type = true;
+  stype->input_link_limit = 1;
+  stype->output_link_limit = 1;
+
   return stype;
 }