1 files changed, 1 insertions, 182 deletions

diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c
index 7620c8fa1a8..5c2d84cf605 100644
--- a/source/blender/nodes/intern/node_util.c
+++ b/source/blender/nodes/intern/node_util.c
@@ -35,6 +35,7 @@
 
 #include "BKE_colortools.h"
 #include "BKE_node.h"
+#include "BKE_node_tree_update.h"
 
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
@@ -340,188 +341,6 @@ void node_insert_link_default(bNodeTree *ntree, bNode *node, bNodeLink *link)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Internal Links (mute and disconnect)
- * \{ */
-
-/**
- * Common datatype priorities, works for compositor, shader and texture nodes alike
- * defines priority of datatype connection based on output type (to):
- * `<  0`: never connect these types.
- * `>= 0`: priority of connection (higher values chosen first).
- */
-static int node_datatype_priority(const bNodeSocketType *from, const bNodeSocketType *to)
-{
-  switch (to->type) {
-    case SOCK_RGBA:
-      switch (from->type) {
-        case SOCK_RGBA:
-          return 4;
-        case SOCK_FLOAT:
-          return 3;
-        case SOCK_INT:
-          return 2;
-        case SOCK_BOOLEAN:
-          return 1;
-      }
-      return -1;
-    case SOCK_VECTOR:
-      switch (from->type) {
-        case SOCK_VECTOR:
-          return 4;
-        case SOCK_FLOAT:
-          return 3;
-        case SOCK_INT:
-          return 2;
-        case SOCK_BOOLEAN:
-          return 1;
-      }
-      return -1;
-    case SOCK_FLOAT:
-      switch (from->type) {
-        case SOCK_FLOAT:
-          return 5;
-        case SOCK_INT:
-          return 4;
-        case SOCK_BOOLEAN:
-          return 3;
-        case SOCK_RGBA:
-          return 2;
-        case SOCK_VECTOR:
-          return 1;
-      }
-      return -1;
-    case SOCK_INT:
-      switch (from->type) {
-        case SOCK_INT:
-          return 5;
-        case SOCK_FLOAT:
-          return 4;
-        case SOCK_BOOLEAN:
-          return 3;
-        case SOCK_RGBA:
-          return 2;
-        case SOCK_VECTOR:
-          return 1;
-      }
-      return -1;
-    case SOCK_BOOLEAN:
-      switch (from->type) {
-        case SOCK_BOOLEAN:
-          return 5;
-        case SOCK_INT:
-          return 4;
-        case SOCK_FLOAT:
-          return 3;
-        case SOCK_RGBA:
-          return 2;
-        case SOCK_VECTOR:
-          return 1;
-      }
-      return -1;
-  }
-
-  /* The rest of the socket types only allow an internal link if both the input and output socket
-   * have the same type. If the sockets are custom, we check the idname instead. */
-  if (to->type == from->type && (to->type != SOCK_CUSTOM || STREQ(to->idname, from->idname))) {
-    return 1;
-  }
-
-  return -1;
-}
-
-/* select a suitable input socket for an output */
-static bNodeSocket *select_internal_link_input(bNode *node, bNodeSocket *output)
-{
-  if (node->type == NODE_REROUTE) {
-    return node->inputs.first;
-  }
-
-  bNodeSocket *selected = NULL, *input;
-  int i;
-  int sel_priority = -1;
-  bool sel_is_linked = false;
-
-  for (input = node->inputs.first, i = 0; input; input = input->next, i++) {
-    int priority = node_datatype_priority(input->typeinfo, output->typeinfo);
-    bool is_linked = (input->link != NULL);
-    bool preferred;
-
-    if (nodeSocketIsHidden(input) || /* ignore hidden sockets */
-        input->flag &
-            SOCK_NO_INTERNAL_LINK || /* ignore if input is not allowed for internal connections */
-        priority < 0 ||              /* ignore incompatible types */
-        priority < sel_priority)     /* ignore if we already found a higher priority input */
-    {
-      continue;
-    }
-
-    /* determine if this input is preferred over the currently selected */
-    preferred = (priority > sel_priority) ||   /* prefer higher datatype priority */
-                (is_linked && !sel_is_linked); /* prefer linked over unlinked */
-
-    if (preferred) {
-      selected = input;
-      sel_is_linked = is_linked;
-      sel_priority = priority;
-    }
-  }
-
-  return selected;
-}
-
-void node_internal_links_create(bNodeTree *ntree, bNode *node)
-{
-  bNodeLink *link;
-  bNodeSocket *output, *input;
-
-  /* sanity check */
-  if (!ntree) {
-    return;
-  }
-
-  /* use link pointer as a tag for handled sockets (for outputs is unused anyway) */
-  for (output = node->outputs.first; output; output = output->next) {
-    output->link = NULL;
-  }
-
-  for (link = ntree->links.first; link; link = link->next) {
-    if (nodeLinkIsHidden(link)) {
-      continue;
-    }
-
-    output = link->fromsock;
-    if (link->fromnode != node || output->link) {
-      continue;
-    }
-    if (nodeSocketIsHidden(output) || output->flag & SOCK_NO_INTERNAL_LINK) {
-      continue;
-    }
-    output->link = link; /* not really used, just for tagging handled sockets */
-
-    /* look for suitable input */
-    input = select_internal_link_input(node, output);
-
-    if (input) {
-      bNodeLink *ilink = MEM_callocN(sizeof(bNodeLink), "internal node link");
-      ilink->fromnode = node;
-      ilink->fromsock = input;
-      ilink->tonode = node;
-      ilink->tosock = output;
-      /* internal link is always valid */
-      ilink->flag |= NODE_LINK_VALID;
-      BLI_addtail(&node->internal_links, ilink);
-    }
-  }
-
-  /* clean up */
-  for (output = node->outputs.first; output; output = output->next) {
-    output->link = NULL;
-  }
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
 /** \name Default value RNA access
  * \{ */