diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-07-14 20:42:12 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-07-14 20:42:12 +0300 |
| commit | f9f3ece427daa7f8592876bdf96f5cffd759dfec (patch) | |
| tree | 987bf11270a87914c2bfbd0de1415b778725db20 /source/blender/blenkernel/BKE_node.h | |
| parent | 77116c1841bf503d724a5676042b6451d167d4fe (diff) | |
| parent | 2829caa9f882f1aa6e716fa0118839ac7057fa88 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate
# Conflicts:
# source/blender/blenkernel/BKE_node.h
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 5092ab6a7a5..35444bc9fa5 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1458,9 +1458,10 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_VIEWER 1067 #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068 #define GEO_NODE_CURVE_ENDPOINTS 1069 -#define GEO_NODE_COLLAPSE 1070 -#define GEO_NODE_UNSUBDIVIDE 1071 -#define GEO_NODE_DISSOLVE 1072 +#define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 +#define GEO_NODE_COLLAPSE 1071 +#define GEO_NODE_UNSUBDIVIDE 1072 +#define GEO_NODE_DISSOLVE 1073 /** \} */ /* -------------------------------------------------------------------- */ |