diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-01-04 15:38:02 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-01-04 15:38:02 +0300 |
| commit | 3f3adef4a07df05fe92e0b948d4e2bc48f5ec3fc (patch) | |
| tree | bd663322534a595e3e07bf37bce66fb7d177fe2b /source/blender/blenkernel/BKE_node.h | |
| parent | c5b55a84f58aebc302de66fff13816d4beda38ee (diff) | |
| parent | b2867d436585bf7ff92f1d7e9a0de9bb5ede006b (diff) | |
Merge branch 'master' into temp-copy-on-writetemp-copy-on-write
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 8bc4292448d..56b44994985 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -969,9 +969,11 @@ bool nodeGroupPoll(struct bNodeTree *nodetree, /** * Initialize a new node type struct with default values and callbacks. */ -void node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag); -void node_type_base_custom( - struct bNodeType *ntype, const char *idname, const char *name, short nclass, short flag); +void node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass); +void node_type_base_custom(struct bNodeType *ntype, + const char *idname, + const char *name, + short nclass); void node_type_socket_templates(struct bNodeType *ntype, struct bNodeSocketTemplate *inputs, struct bNodeSocketTemplate *outputs); @@ -1707,6 +1709,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_INPUT_MESH_ISLAND 1144 #define GEO_NODE_INPUT_SCENE_TIME 1145 #define GEO_NODE_ACCUMULATE_FIELD 1146 +#define GEO_NODE_INPUT_MESH_EDGE_ANGLE 1147 /** \} */ |