diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-07-23 22:08:25 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-07-23 22:08:25 +0300 |
| commit | aaee6e13d4508f337bcc3808c3c158a468930791 (patch) | |
| tree | 8da3bfaaf3d03503c44b12ff42319c7ea38661b4 /source/blender/blenkernel/BKE_node.h | |
| parent | 226ae2e69f416e56fc153a6416dd0329324b4916 (diff) | |
| parent | c41b93bda5328ce13faf7048dfd38708e6486b6a (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks
# Conflicts:
# source/blender/blenkernel/BKE_node.h
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index cf00056ce0d..5ac132321d9 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1464,7 +1464,9 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068 #define GEO_NODE_CURVE_ENDPOINTS 1069 #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 -#define GEO_NODE_REMESH_BLOCKS 1071 +#define GEO_NODE_CURVE_TRIM 1071 +#define GEO_NODE_CURVE_SET_HANDLES 1072 +#define GEO_NODE_REMESH_BLOCKS 1073 /** \} */ |