From 81ec3dce6542f996e5d61017fab83bd721b61822 Mon Sep 17 00:00:00 2001 From: Aleksi Juvani Date: Wed, 6 Apr 2022 17:30:56 -0500 Subject: Geometry Nodes: Add "Connected" mode to Merge by Distance node Expose the "Connected" mode from the weld modifier in the "Merge by Distance" geometry node. This method only merges vertices along existing edges, but it can be much faster because it doesn't have to build a KD Tree of all selected points. Differential Revision: https://developer.blender.org/D14321 --- source/blender/makesdna/DNA_node_types.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 73539bea8ee..ff7686d87af 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -1296,6 +1296,11 @@ typedef struct NodeGeometryMeshCone { uint8_t fill_type; } NodeGeometryMeshCone; +typedef struct NodeGeometryMergeByDistance { + /* GeometryNodeMergeByDistanceMode. */ + uint8_t mode; +} NodeGeometryMergeByDistance; + typedef struct NodeGeometryMeshLine { /* GeometryNodeMeshLineMode. */ uint8_t mode; @@ -2007,6 +2012,11 @@ typedef enum GeometryNodeMeshCircleFillType { GEO_NODE_MESH_CIRCLE_FILL_TRIANGLE_FAN = 2, } GeometryNodeMeshCircleFillType; +typedef enum GeometryNodeMergeByDistanceMode { + GEO_NODE_MERGE_BY_DISTANCE_MODE_ALL = 0, + GEO_NODE_MERGE_BY_DISTANCE_MODE_CONNECTED = 1, +} GeometryNodeMergeByDistanceMode; + typedef enum GeometryNodeMeshLineMode { GEO_NODE_MESH_LINE_MODE_END_POINTS = 0, GEO_NODE_MESH_LINE_MODE_OFFSET = 1, -- cgit v1.2.3