diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:36:26 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:36:26 +0300 |
| commit | 9e4e3b5f5f30acb95021a36fcdf868f1fc1b16d7 (patch) | |
| tree | 54307ec851ad8168da3f2699771b3c65839cd331 /source/blender/blenkernel/BKE_node.h | |
| parent | 844d97597261397e962058ae4d69d2cfa860c619 (diff) | |
| parent | b60fa776786b1217f7f1b35eb9d843bbd651bace (diff) | |
Merge branch 'soc-2021-porting-modifiers-to-nodes-merge-by-distance' into soc-2021-porting-modifiers-to-nodes
# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/makesrna/RNA_enum_types.h
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index c2809833996..81257a8196c 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1477,12 +1477,13 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_SET_HANDLES 1072 #define GEO_NODE_CURVE_SPLINE_TYPE 1073 #define GEO_NODE_CURVE_SELECT_HANDLES 1074 -#define GEO_NODE_MESH_EXTRUDE 1075 -#define GEO_NODE_MESH_INSET 1076 -#define GEO_NODE_CURVE_SELECT_HANDLES 1077 -#define GEO_NODE_COLLAPSE 1078 -#define GEO_NODE_UNSUBDIVIDE 1079 -#define GEO_NODE_DISSOLVE 1080 +#define GEO_NODE_MERGE_BY_DISTANCE 1075 +#define GEO_NODE_MESH_EXTRUDE 1076 +#define GEO_NODE_MESH_INSET 1077 +#define GEO_NODE_CURVE_SELECT_HANDLES 1078 +#define GEO_NODE_COLLAPSE 1079 +#define GEO_NODE_UNSUBDIVIDE 1080 +#define GEO_NODE_DISSOLVE 1081 /** \} */ /* -------------------------------------------------------------------- */ |