[Bf-blender-cvs] [cec2aecd189] 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: cec2aecd189d4254be6fb6acb5e6ea4d080779f8
Author: Fabian Schempp
Date:   Mon Oct 4 22:01:25 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-merge-by-distance
https://developer.blender.org/rBcec2aecd189d4254be6fb6acb5e6ea4d080779f8

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 41be72ace48,79ae9d71762..f174bbef2f2
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1512,8 -1513,8 +1513,10 @@@ int ntreeTexExecTree(struct bNodeTree *
  #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
+ #define GEO_NODE_POINTS_TO_VOLUME 1101
+ #define GEO_NODE_CURVE_HANDLE_TYPE_SELECTION 1102
++#define GEO_NODE_MERGE_BY_DISTANCE 1103
 +
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/nodes/CMakeLists.txt
index 9009e1d4a55,dab7579d946..1747a8362e1
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -238,9 -239,9 +240,10 @@@ set(SR
    geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
    geometry/nodes/node_geo_mesh_subdivide.cc
    geometry/nodes/node_geo_mesh_to_points.cc
 +  geometry/nodes/node_geo_merge_by_distance.cc
    geometry/nodes/node_geo_object_info.cc
    geometry/nodes/node_geo_points_to_vertices.cc
+   geometry/nodes/node_geo_points_to_volume.cc
    geometry/nodes/node_geo_proximity.cc
    geometry/nodes/node_geo_realize_instances.cc
    geometry/nodes/node_geo_separate_components.cc