diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-04-13 16:11:14 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-04-13 16:11:14 +0300 |
commit | 1d0eaa7892c02d2908637cf89d4b69c71137d18c (patch) | |
tree | a4ee40b8bf385f87ab8878a62b925ebe8c43a9b7 /source/blender/makesdna/DNA_node_types.h | |
parent | 8acee6ab65f27c9879826d931e1c2587e424b5d1 (diff) | |
parent | 0a57d6d076da6afb5a2ac9365838dee27b72cbfd (diff) |
Merge branch 'master' into tmp-new-gpu-codegen
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index e22b1362307..1b9192c75cf 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -386,6 +386,8 @@ typedef struct bNode { #define NODE_DO_OUTPUT_RECALC (1 << 17) /* A preview for the data in this node can be displayed in the spreadsheet editor. */ #define __NODE_ACTIVE_PREVIEW (1 << 18) /* deprecated */ +/* Active node that is used to paint on. */ +#define NODE_ACTIVE_PAINT_CANVAS (1 << 19) /* node->update */ #define NODE_UPDATE_ID 1 /* associated id data block has changed */ @@ -1285,6 +1287,11 @@ typedef struct NodeGeometryMeshCone { uint8_t fill_type; } NodeGeometryMeshCone; +typedef struct NodeGeometryMergeByDistance { + /* GeometryNodeMergeByDistanceMode. */ + uint8_t mode; +} NodeGeometryMergeByDistance; + typedef struct NodeGeometryMeshLine { /* GeometryNodeMeshLineMode. */ uint8_t mode; @@ -1996,6 +2003,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, |