diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:46:29 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:46:29 +0300 |
| commit | 2fb714443c85f46e64880abcc458b65f7d2cb350 (patch) | |
| tree | dc9b3795bc870287d15b7a2a687252254a5730f3 /source/blender/blenkernel/BKE_node.h | |
| parent | 529a132cc90c4d266397ad170e0ae0d0bdeef0da (diff) | |
| parent | bcb7f4c17278c3320ee34100eae37822ee780b10 (diff) | |
Merge branch 'soc-2021-porting-modifiers-to-nodes-solidify' into soc-2021-porting-modifiers-to-nodes
# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
# source/blender/geometry/CMakeLists.txt
# source/blender/makesrna/RNA_enum_types.h
# source/blender/modifiers/CMakeLists.txt
# source/blender/nodes/NOD_static_types.h
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 70841276dd5..8e598a34c85 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1477,15 +1477,16 @@ 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_REMESH_VOXEL 1075 -#define GEO_NODE_REMESH_BLOCKS 1075 -#define GEO_NODE_MERGE_BY_DISTANCE 1076 -#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 +#define GEO_NODE_SOLIDIFY 1075 +#define GEO_NODE_REMESH_VOXEL 1076 +#define GEO_NODE_REMESH_BLOCKS 1077 +#define GEO_NODE_MERGE_BY_DISTANCE 1078 +#define GEO_NODE_MESH_EXTRUDE 1079 +#define GEO_NODE_MESH_INSET 1080 +#define GEO_NODE_CURVE_SELECT_HANDLES 1081 +#define GEO_NODE_COLLAPSE 1082 +#define GEO_NODE_UNSUBDIVIDE 1083 +#define GEO_NODE_DISSOLVE 1084 /** \} */ /* -------------------------------------------------------------------- */ |