diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-07-09 11:30:41 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-07-09 11:30:41 +0300 |
| commit | 77116c1841bf503d724a5676042b6451d167d4fe (patch) | |
| tree | 2daaf7349861871143c82443378caf344da418f9 /source/blender/blenkernel/BKE_node.h | |
| parent | 950f1bf476c991c65df06027b1cfc34ba1b7f334 (diff) | |
| parent | 07faa3c5acac2a3652d632b2e1580fb4233496a8 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate
# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 76d7cef88ce..5092ab6a7a5 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1417,7 +1417,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_VOLUME_TO_MESH 1026 #define GEO_NODE_ATTRIBUTE_COMBINE_XYZ 1027 #define GEO_NODE_ATTRIBUTE_SEPARATE_XYZ 1028 -#define GEO_NODE_SUBDIVIDE 1029 +#define GEO_NODE_MESH_SUBDIVIDE 1029 #define GEO_NODE_ATTRIBUTE_REMOVE 1030 #define GEO_NODE_ATTRIBUTE_CONVERT 1031 #define GEO_NODE_MESH_PRIMITIVE_CUBE 1032 @@ -1457,9 +1457,10 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066 #define GEO_NODE_VIEWER 1067 #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068 -#define GEO_NODE_COLLAPSE 1069 -#define GEO_NODE_UNSUBDIVIDE 1070 -#define GEO_NODE_DISSOLVE 1071 +#define GEO_NODE_CURVE_ENDPOINTS 1069 +#define GEO_NODE_COLLAPSE 1070 +#define GEO_NODE_UNSUBDIVIDE 1071 +#define GEO_NODE_DISSOLVE 1072 /** \} */ /* -------------------------------------------------------------------- */ |