[Bf-blender-cvs] [0d2d027df06] soc-2021-porting-modifiers-to-nodes-merge-by-distance: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

[Fabian Schempp]

Commit: 0d2d027df0642f062d5d3d42970e20ca657ca355
Author: Fabian Schempp
Date:   Sat Oct 2 00:18:17 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-merge-by-distance
https://developer.blender.org/rB0d2d027df0642f062d5d3d42970e20ca657ca355

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

# Conflicts:
#	source/blender/blenkernel/BKE_node.h

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_node.h
index 49eabf73bd9,0ad92f8d190..41be72ace48
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1507,8 -1508,10 +1508,12 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_POINTS_TO_VERTICES 1094
  #define GEO_NODE_CURVE_REVERSE 1095
  #define GEO_NODE_PROXIMITY 1096
- #define GEO_NODE_MERGE_BY_DISTANCE 1097
+ #define GEO_NODE_CURVE_SUBDIVIDE 1097
+ #define GEO_NODE_INPUT_SPLINE_LENGTH 1098
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1099
+ #define GEO_NODE_CURVE_SET_HANDLES 1100
++#define GEO_NODE_MERGE_BY_DISTANCE 1101
 +
  /** \} */
  
  /* -------------------------------------------------------------------- */