diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-03-14 01:15:50 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-03-14 01:15:50 +0300 |
| commit | 9f68f5c1e1ac5c4a93e4073598e9336c9ea89f36 (patch) | |
| tree | da2bcb43b701724655a88068b6b3c01b579df5e8 /source | |
| parent | dcfea4a1e5068f74862402cf3a53c9c829c5cd79 (diff) | |
Nodes: Add distance float socket type
This is necessary to make float sockets display a value with the unit
system. `PROP_DISTANCE` will be used quite a lot by the mesh primitives
geometry nodes patch.
Differential Revision: https://developer.blender.org/D10711
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/node.cc | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/intern/node_socket.cc | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 156f6a0c7ae..b6f02128353 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -1568,6 +1568,8 @@ const char *nodeStaticSocketType(int type, int subtype) return "NodeSocketFloatAngle"; case PROP_TIME: return "NodeSocketFloatTime"; + case PROP_DISTANCE: + return "NodeSocketFloatDistance"; case PROP_NONE: default: return "NodeSocketFloat"; @@ -1637,6 +1639,8 @@ const char *nodeStaticSocketInterfaceType(int type, int subtype) return "NodeSocketInterfaceFloatAngle"; case PROP_TIME: return "NodeSocketInterfaceFloatTime"; + case PROP_DISTANCE: + return "NodeSocketInterfaceFloatDistance"; case PROP_NONE: default: return "NodeSocketInterfaceFloat"; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index aed1b82e940..622460979e7 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -10088,6 +10088,8 @@ static void rna_def_node_socket_standard_types(BlenderRNA *brna) brna, "NodeSocketFloatAngle", "NodeSocketInterfaceFloatAngle", PROP_ANGLE); rna_def_node_socket_float( brna, "NodeSocketFloatTime", "NodeSocketInterfaceFloatTime", PROP_TIME); + rna_def_node_socket_float( + brna, "NodeSocketFloatDistance", "NodeSocketInterfaceFloatDistance", PROP_DISTANCE); rna_def_node_socket_int(brna, "NodeSocketInt", "NodeSocketInterfaceInt", PROP_NONE); rna_def_node_socket_int( diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc index 60c2d6c37e1..2d60e959c44 100644 --- a/source/blender/nodes/intern/node_socket.cc +++ b/source/blender/nodes/intern/node_socket.cc @@ -712,6 +712,7 @@ void register_standard_node_socket_types(void) nodeRegisterSocketType(make_socket_type_float(PROP_FACTOR)); nodeRegisterSocketType(make_socket_type_float(PROP_ANGLE)); nodeRegisterSocketType(make_socket_type_float(PROP_TIME)); + nodeRegisterSocketType(make_socket_type_float(PROP_DISTANCE)); nodeRegisterSocketType(make_socket_type_int(PROP_NONE)); nodeRegisterSocketType(make_socket_type_int(PROP_UNSIGNED)); |