[Bf-blender-cvs] [d777efbf5cd] 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: d777efbf5cdd6612a06a970e33784f06f68f277a
Author: Fabian Schempp
Date:   Fri Jul 23 08:15:08 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-merge-by-distance
https://developer.blender.org/rBd777efbf5cdd6612a06a970e33784f06f68f277a

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 f6ad4f34ef3,cecb3118038..1710ba2a4f1
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1465,7 -1465,7 +1465,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_ENDPOINTS 1069
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
  #define GEO_NODE_CURVE_TRIM 1071
- #define GEO_NODE_MERGE_BY_DISTANCE 1072
+ #define GEO_NODE_CURVE_SET_HANDLES 1072
++#define GEO_NODE_MERGE_BY_DISTANCE 1073
  
  /** \} */