1 files changed, 18 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c
index 4076dc852b3..1aec280fd2b 100644
--- a/source/blender/nodes/intern/node_util.c
+++ b/source/blender/nodes/intern/node_util.c
@@ -140,8 +140,8 @@ void node_math_update(bNodeTree *UNUSED(ntree), bNode *node)
 
   switch (node->custom1) {
     case NODE_MATH_WRAP:
-      node_sock_label(sock2, "Min");
-      node_sock_label(sock3, "Max");
+      node_sock_label(sock2, "Max");
+      node_sock_label(sock3, "Min");
       break;
     case NODE_MATH_MULTIPLY_ADD:
       node_sock_label(sock2, "Multiplier");
@@ -459,6 +459,22 @@ static int node_datatype_priority(eNodeSocketDatatype from, eNodeSocketDatatype
           return -1;
       }
     }
+    case SOCK_TEXTURE: {
+      switch (from) {
+        case SOCK_TEXTURE:
+          return 1;
+        default:
+          return -1;
+      }
+    }
+    case SOCK_MATERIAL: {
+      switch (from) {
+        case SOCK_MATERIAL:
+          return 1;
+        default:
+          return -1;
+      }
+    }
     default:
       return -1;
   }