[Bf-blender-cvs] [02c3ecc] object_nodes: Cleanup: Renamed socket type utility functions for clarity.

[Lukas Tönne]

Commit: 02c3eccc31b060ed749d9f427de7e360c9c255af
Author: Lukas Tönne
Date:   Sun Dec 6 17:59:41 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB02c3eccc31b060ed749d9f427de7e360c9c255af

Cleanup: Renamed socket type utility functions for clarity.

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

M	release/scripts/nodes/group_nodes.py
M	release/scripts/nodes/node_compiler.py
M	release/scripts/nodes/socket_types.py

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

diff --git a/release/scripts/nodes/group_nodes.py b/release/scripts/nodes/group_nodes.py
index 2f2d04e..d6e07c0 100644
--- a/release/scripts/nodes/group_nodes.py
+++ b/release/scripts/nodes/group_nodes.py
@@ -22,7 +22,7 @@ import bpy
 import nodeitems_utils
 from bpy.types import Operator, Panel, UIList, NodeTree, Node, NodeSocket, ObjectNode, PropertyGroup, BVMTypeDesc
 from bpy.props import *
-from socket_types import bvm_type_items, bvm_type_to_socket
+from socket_types import socket_type_items, socket_type_to_rna
 
 ###############################################################################
 # Group Interface
@@ -31,7 +31,7 @@ def make_node_group_interface(prefix, treetype, tree_items_update):
     _in_out_items = [('IN', "In", "Input"), ('OUT', "Out", "Output")]
 
     prop_name = StringProperty(name="Name", default="Value", update=tree_items_update)
-    prop_base_type = EnumProperty(name="Base Type", items=bvm_type_items, default='FLOAT', update=tree_items_update)
+    prop_base_type = EnumProperty(name="Base Type", items=socket_type_items, default='FLOAT', update=tree_items_update)
     prop_in_out = EnumProperty(name="In/Out", items=_in_out_items, default='IN')
 
     # XXX PropertyGroup does not have a bl_idname,
@@ -217,7 +217,7 @@ def make_node_group_types(prefix, treetype, node_base):
         
         def find_match(s):
             for i in free_items:
-                if i.name == s.name and isinstance(s, bvm_type_to_socket(i.base_type)):
+                if i.name == s.name and isinstance(s, socket_type_to_rna(i.base_type)):
                     return i
 
         def socket_index(s):
@@ -247,7 +247,7 @@ def make_node_group_types(prefix, treetype, node_base):
             s = match.get(i, None)
             if s is None:
                 # add socket for unmatched item
-                stype = bvm_type_to_socket(i.base_type)
+                stype = socket_type_to_rna(i.base_type)
                 s = sockets.new(stype.bl_rna.identifier, i.name)
 
             index = socket_index(s)
diff --git a/release/scripts/nodes/node_compiler.py b/release/scripts/nodes/node_compiler.py
index 1d57428..40084f6 100644
--- a/release/scripts/nodes/node_compiler.py
+++ b/release/scripts/nodes/node_compiler.py
@@ -19,7 +19,7 @@
 # <pep8-80 compliant>
 
 from collections import OrderedDict
-from socket_types import socket_type_to_bvm, convert_sockets
+from socket_types import socket_to_bvm_type, convert_sockets
 
 # Utility dict type that works like RNA collections,
 # i.e. accepts both string keys and integer indices
@@ -80,7 +80,7 @@ class NodeCompiler:
         # proxies for inputs/outputs
         bnode_inputs = StringDict()
         for binput in bnode.inputs:
-            proxy = self.add_proxy(socket_type_to_bvm(binput))
+            proxy = self.add_proxy(socket_to_bvm_type(binput))
             bnode_inputs[binput.identifier] = proxy
             input_map[(bnode, binput)] = proxy.inputs[0]
 
@@ -89,7 +89,7 @@ class NodeCompiler:
         
         bnode_outputs = StringDict()
         for boutput in bnode.outputs:
-            proxy = self.add_proxy(socket_type_to_bvm(boutput))
+            proxy = self.add_proxy(socket_to_bvm_type(boutput))
             bnode_outputs[boutput.identifier] = proxy
             output_map[(bnode, boutput)] = proxy.outputs[0]
 
diff --git a/release/scripts/nodes/socket_types.py b/release/scripts/nodes/socket_types.py
index dba8f93..d49a55d 100644
--- a/release/scripts/nodes/socket_types.py
+++ b/release/scripts/nodes/socket_types.py
@@ -42,7 +42,7 @@ class GeometrySocket(NodeSocket):
 
 ###############################################################################
 
-bvm_type_items = [
+socket_type_items = [
     ("FLOAT", "Float", "Floating point number", 0, 0),
     ("INT", "Int", "Integer number", 0, 1),
     ("VECTOR", "Vector", "3D vector", 0, 2),
@@ -50,7 +50,7 @@ bvm_type_items = [
     ("MESH", "Mesh", "Mesh data", 0, 4),
     ]
 
-def bvm_type_to_socket(base_type):
+def socket_type_to_rna(base_type):
     types = {
         "FLOAT" : bpy.types.NodeSocketFloat,
         "INT" : bpy.types.NodeSocketInt,
@@ -60,7 +60,7 @@ def bvm_type_to_socket(base_type):
         }
     return types.get(base_type, None)
 
-def socket_type_to_bvm(socket):
+def socket_to_bvm_type(socket):
     if isinstance(socket, bpy.types.NodeSocketFloat):
         return 'FLOAT'
     elif isinstance(socket, bpy.types.NodeSocketVector):