diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:39:49 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:39:49 +0300 |
| commit | 6e58f6b30451725d7a28623f48c93c2a15eec166 (patch) | |
| tree | 2b1407300f1fc413719abb729bde64c3c697a1a1 /source/blender/blenkernel/BKE_node.h | |
| parent | 9e4e3b5f5f30acb95021a36fcdf868f1fc1b16d7 (diff) | |
| parent | ce4420e803ded4b2d0e8bbb6fd1c4cb2b6c8ba22 (diff) | |
Merge branch 'soc-2021-porting-modifiers-to-nodes-remesh-blocks' 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/intern/rna_nodetree.c
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 81257a8196c..7c5853ab566 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1477,7 +1477,8 @@ 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_MERGE_BY_DISTANCE 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 |