[Bf-blender-cvs] [79743803fe8] geometry-nodes-curve-to-points-node: Merge branch 'master' into geometry-nodes-curve-to-points-node

[Hans Goudey]

Commit: 79743803fe899229b6fc02f954effedf6a5ad71d
Author: Hans Goudey
Date:   Wed Jun 9 12:32:09 2021 -0500
Branches: geometry-nodes-curve-to-points-node
https://developer.blender.org/rB79743803fe899229b6fc02f954effedf6a5ad71d

Merge branch 'master' into geometry-nodes-curve-to-points-node

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 1051a03f15f,a67d7116874..9401e6a9f02
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1433,7 -1433,7 +1433,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_DELETE_GEOMETRY 1053
  #define GEO_NODE_CURVE_LENGTH 1054
  #define GEO_NODE_SELECT_BY_MATERIAL 1055
- #define GEO_NODE_CURVE_TO_POINTS 1056
+ #define GEO_NODE_CONVEX_HULL 1056
++#define GEO_NODE_CURVE_TO_POINTS 1057
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index b024321b973,8d8f7b90d3b..0500ce56309
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5050,9 -5050,9 +5050,10 @@@ static void registerGeometryNodes(
    register_node_type_geo_boolean();
    register_node_type_geo_bounding_box();
    register_node_type_geo_collection_info();
+   register_node_type_geo_convex_hull();
    register_node_type_geo_curve_length();
    register_node_type_geo_curve_to_mesh();
 +  register_node_type_geo_curve_to_points();
    register_node_type_geo_curve_resample();
    register_node_type_geo_delete_geometry();
    register_node_type_geo_edge_split();
diff --cc source/blender/nodes/CMakeLists.txt
index 92d03b9763a,025ce79ffc5..c364750546a
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -162,9 -162,9 +162,10 @@@ set(SR
    geometry/nodes/node_geo_bounding_box.cc
    geometry/nodes/node_geo_collection_info.cc
    geometry/nodes/node_geo_common.cc
+   geometry/nodes/node_geo_convex_hull.cc
    geometry/nodes/node_geo_curve_length.cc  
    geometry/nodes/node_geo_curve_to_mesh.cc
 +  geometry/nodes/node_geo_curve_to_points.cc
    geometry/nodes/node_geo_curve_resample.cc
    geometry/nodes/node_geo_delete_geometry.cc
    geometry/nodes/node_geo_edge_split.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 841d17b4ba5,b7e1b0b657c..1995a42731e
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -50,9 -50,9 +50,10 @@@ void register_node_type_geo_attribute_r
  void register_node_type_geo_boolean(void);
  void register_node_type_geo_bounding_box(void);
  void register_node_type_geo_collection_info(void);
+ void register_node_type_geo_convex_hull(void);
  void register_node_type_geo_curve_length(void);
  void register_node_type_geo_curve_to_mesh(void);
 +void register_node_type_geo_curve_to_points(void);
  void register_node_type_geo_curve_resample(void);
  void register_node_type_geo_delete_geometry(void);
  void register_node_type_geo_edge_split(void);