[Bf-blender-cvs] [b1d21db61b6] functions: remove colored socket builder

[Jacques Lucke]

Commit: b1d21db61b6c9499e393cd2e6e3489dda433e0ca
Author: Jacques Lucke
Date:   Mon Jul 22 10:48:34 2019 +0200
Branches: functions
https://developer.blender.org/rBb1d21db61b6c9499e393cd2e6e3489dda433e0ca

remove colored socket builder

===================================================================

M	release/scripts/startup/nodes/sockets.py
M	release/scripts/startup/nodes/types.py
M	release/scripts/startup/nodes/types_base.py

===================================================================

diff --git a/release/scripts/startup/nodes/sockets.py b/release/scripts/startup/nodes/sockets.py
index 417fe98986b..07db7aa85dd 100644
--- a/release/scripts/startup/nodes/sockets.py
+++ b/release/scripts/startup/nodes/sockets.py
@@ -105,6 +105,20 @@ class ObjectSocket(bpy.types.NodeSocket, DataSocket):
     def restore_state(self, state):
         self.value = state
 
+def create_simple_data_socket(idname, color):
+    return type(idname, (bpy.types.NodeSocket, DataSocket),
+        {
+            "bl_idname" : idname,
+            "bl_label" : idname,
+            "draw_color" : lambda self, context, node: color,
+        })
+
+FloatListSocket = create_simple_data_socket("fn_FloatListSocket", (0, 0.3, 0.5, 0.5))
+VectorListSocket = create_simple_data_socket("fn_VectorListSocket", (0, 0, 0.5, 0.5))
+IntegerListSocket = create_simple_data_socket("fn_IntegerListSocket", (0.3, 0.7, 0.5, 0.5))
+BooleanListSocket = create_simple_data_socket("fn_BooleanListSocket", (0.3, 0.3, 0.3, 0.5))
+ObjectListSocket = create_simple_data_socket("fn_ObjectListSocket", (0, 0, 0, 0.5))
+
 class CustomColoredSocket(bpy.types.NodeSocket, DataSocket):
     bl_idname = "fn_CustomColoredSocket"
     bl_label = "Custom Colored Socket"
diff --git a/release/scripts/startup/nodes/types.py b/release/scripts/startup/nodes/types.py
index f6dc77b1b26..beba691ead0 100644
--- a/release/scripts/startup/nodes/types.py
+++ b/release/scripts/startup/nodes/types.py
@@ -1,7 +1,6 @@
 from . types_base import (
     DataTypesInfo,
     UniqueSocketBuilder,
-    ColoredSocketBuilder,
 )
 
 from . sockets import (
@@ -10,7 +9,11 @@ from . sockets import (
     VectorSocket,
     BooleanSocket,
     ObjectSocket,
-    CustomColoredSocket,
+    FloatListSocket,
+    VectorListSocket,
+    IntegerListSocket,
+    BooleanListSocket,
+    ObjectListSocket,
 )
 
 type_infos = DataTypesInfo()
@@ -18,22 +21,22 @@ type_infos = DataTypesInfo()
 type_infos.insert_data_type(
     "Float",
     UniqueSocketBuilder(FloatSocket),
-    ColoredSocketBuilder((0, 0.3, 0.5, 0.5)))
+    UniqueSocketBuilder(FloatListSocket))
 type_infos.insert_data_type(
     "Vector",
     UniqueSocketBuilder(VectorSocket),
-    ColoredSocketBuilder((0, 0, 0.5, 0.5)))
+    UniqueSocketBuilder(VectorListSocket))
 type_infos.insert_data_type(
     "Integer",
     UniqueSocketBuilder(IntegerSocket),
-    ColoredSocketBuilder((0.3, 0.7, 0.5, 0.5)))
+    UniqueSocketBuilder(IntegerListSocket))
 type_infos.insert_data_type(
     "Boolean",
     UniqueSocketBuilder(BooleanSocket),
-    ColoredSocketBuilder((0.3, 0.3, 0.3, 0.5)))
+    UniqueSocketBuilder(BooleanListSocket))
 type_infos.insert_data_type(
     "Object",
     UniqueSocketBuilder(ObjectSocket),
-    ColoredSocketBuilder((0, 0, 0, 0.5)))
+    UniqueSocketBuilder(ObjectListSocket))
 
 type_infos.insert_conversion_group(["Boolean", "Integer", "Float"])
diff --git a/release/scripts/startup/nodes/types_base.py b/release/scripts/startup/nodes/types_base.py
index 56a0246488e..03825899ea6 100644
--- a/release/scripts/startup/nodes/types_base.py
+++ b/release/scripts/startup/nodes/types_base.py
@@ -190,17 +190,3 @@ class UniqueSocketBuilder(DataSocketBuilder):
 
     def get_color(self):
         return self.socket_cls.socket_color
-
-class ColoredSocketBuilder(DataSocketBuilder):
-    def __init__(self, color):
-        self.color = color
-
-    def build(self, node_sockets, name, identifier):
-        socket = node_sockets.new(
-            "fn_CustomColoredSocket",
-            name,
-            identifier=identifier)
-        return socket
-
-    def get_color(self):
-        return self.color