diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:35:07 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:35:07 +0300 |
| commit | 844d97597261397e962058ae4d69d2cfa860c619 (patch) | |
| tree | c4478959a158dda71027ab6b35c38c92db6b8a84 /source/blender/blenkernel/BKE_node.h | |
| parent | f5f2e685f5530ba5bc67b0f0285c0413afe3b8be (diff) | |
| parent | 6dda3a7f2e3f9081e38a15baf08cdde8b6a75815 (diff) | |
Merge branch 'soc-2021-porting-modifiers-to-nodes-extrude-and-move' into soc-2021-porting-modifiers-to-nodes
# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 94a64694601..c2809833996 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1476,11 +1476,13 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_TRIM 1071 #define GEO_NODE_CURVE_SET_HANDLES 1072 #define GEO_NODE_CURVE_SPLINE_TYPE 1073 -#define GEO_NODE_MESH_INSET 1074 -#define GEO_NODE_CURVE_SELECT_HANDLES 1075 -#define GEO_NODE_COLLAPSE 1076 -#define GEO_NODE_UNSUBDIVIDE 1077 -#define GEO_NODE_DISSOLVE 1078 +#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 /** \} */ /* -------------------------------------------------------------------- */ |