[Bf-blender-cvs] [539095ca406] temp-geometry-nodes-curve-deform-node: Merge branch 'master' into temp-geometry-nodes-curve-deform-node

[Hans Goudey]

Commit: 539095ca40679ae6fabf343e4bb69a29b7f45f15
Author: Hans Goudey
Date:   Wed Jun 9 13:05:27 2021 -0500
Branches: temp-geometry-nodes-curve-deform-node
https://developer.blender.org/rB539095ca40679ae6fabf343e4bb69a29b7f45f15

Merge branch 'master' into temp-geometry-nodes-curve-deform-node

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 48c3d9b2d97,a67d7116874..5fa7d2b2a95
--- 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_DEFORM 1056
+ #define GEO_NODE_CONVEX_HULL 1056
++#define GEO_NODE_CURVE_DEFORM 1057
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index fa6f8926d2a,8d8f7b90d3b..fec6a7c79a6
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5050,7 -5050,7 +5050,8 @@@ 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_deform();
    register_node_type_geo_curve_length();
    register_node_type_geo_curve_to_mesh();
    register_node_type_geo_curve_resample();
diff --cc source/blender/nodes/CMakeLists.txt
index 006f6d6e90a,025ce79ffc5..a31306d6b08
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -162,7 -162,7 +162,8 @@@ 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_deform.cc
    geometry/nodes/node_geo_curve_length.cc  
    geometry/nodes/node_geo_curve_to_mesh.cc
    geometry/nodes/node_geo_curve_resample.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 14fcee748a9,b7e1b0b657c..d40553801e3
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -50,7 -50,7 +50,8 @@@ 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_deform(void);
  void register_node_type_geo_curve_length(void);
  void register_node_type_geo_curve_to_mesh(void);
  void register_node_type_geo_curve_resample(void);
diff --cc source/blender/nodes/NOD_static_types.h
index 58ce695dca0,b255c6e5f23..77340d67fb6
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -289,7 -289,7 +289,8 @@@ DefNode(GeometryNode, GEO_NODE_ATTRIBUT
  DefNode(GeometryNode, GEO_NODE_BOOLEAN, def_geo_boolean, "BOOLEAN", Boolean, "Boolean", "")
  DefNode(GeometryNode, GEO_NODE_BOUNDING_BOX, 0, "BOUNDING_BOX", BoundBox, "Bounding Box", "")
  DefNode(GeometryNode, GEO_NODE_COLLECTION_INFO, def_geo_collection_info, "COLLECTION_INFO", CollectionInfo, "Collection Info", "")
+ DefNode(GeometryNode, GEO_NODE_CONVEX_HULL, 0, "CONVEX_HULL", ConvexHull, "Convex Hull", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_DEFORM, def_geo_curve_deform, "CURVE_DEFORM", CurveDeform, "Curve Deform", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_LENGTH, 0, "CURVE_LENGTH", CurveLength, "Curve Length", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_RESAMPLE, def_geo_curve_resample, "CURVE_RESAMPLE", CurveResample, "Resample Curve", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")