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

[Hans Goudey]

Commit: 64fc0e34e643f8bf13911b262c44aa5bd4f12779
Author: Hans Goudey
Date:   Thu Jun 3 14:40:44 2021 -0400
Branches: temp-geometry-nodes-curve-deform-node
https://developer.blender.org/rB64fc0e34e643f8bf13911b262c44aa5bd4f12779

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index dba4769051a,00111910d66..1ce97ceddae
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1430,7 -1430,7 +1430,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_INPUT_MATERIAL 1050
  #define GEO_NODE_MATERIAL_REPLACE 1051
  #define GEO_NODE_MESH_TO_CURVE 1052
- #define GEO_NODE_CURVE_DEFORM 1053
+ #define GEO_NODE_DELETE_GEOMETRY 1053
++#define GEO_NODE_CURVE_DEFORM 1054
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 490eebdcd56,0923917aa55..828e33c256c
--- 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_curve_deform();
    register_node_type_geo_curve_to_mesh();
    register_node_type_geo_curve_resample();
+   register_node_type_geo_delete_geometry();
    register_node_type_geo_edge_split();
    register_node_type_geo_input_material();
    register_node_type_geo_is_viewport();
diff --cc source/blender/nodes/CMakeLists.txt
index 8c164da1857,6ecf46647a0..05b5eeffe2f
--- 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_curve_deform.cc
    geometry/nodes/node_geo_curve_to_mesh.cc
    geometry/nodes/node_geo_curve_resample.cc
+   geometry/nodes/node_geo_delete_geometry.cc
    geometry/nodes/node_geo_edge_split.cc
    geometry/nodes/node_geo_input_material.cc
    geometry/nodes/node_geo_is_viewport.cc
diff --cc source/blender/nodes/NOD_geometry.h
index bef765cd215,30b039bca40..10118457891
--- 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_curve_deform(void);
  void register_node_type_geo_curve_to_mesh(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);
  void register_node_type_geo_input_material(void);
  void register_node_type_geo_is_viewport(void);
diff --cc source/blender/nodes/NOD_static_types.h
index bf47da28058,081525ffb5b..2bd170dc162
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -289,9 -289,9 +289,10 @@@ 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_CURVE_DEFORM, def_geo_curve_deform, "CURVE_DEFORM", CurveDeform, "Curve Deform", "")
  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", "")
+ DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, 0, "DELETE_GEOMETRY", DeleteGeometry, "Delete Geometry", "")
  DefNode(GeometryNode, GEO_NODE_EDGE_SPLIT, 0, "EDGE_SPLIT", EdgeSplit, "Edge Split", "")
  DefNode(GeometryNode, GEO_NODE_INPUT_MATERIAL, def_geo_input_material, "INPUT_MATERIAL", InputMaterial, "Material", "")
  DefNode(GeometryNode, GEO_NODE_IS_VIEWPORT, 0, "IS_VIEWPORT", IsViewport, "Is Viewport", "")