[Bf-blender-cvs] [77116c1841b] soc-2021-porting-modifiers-to-nodes-decimate: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

[Fabian Schempp]

Commit: 77116c1841bf503d724a5676042b6451d167d4fe
Author: Fabian Schempp
Date:   Fri Jul 9 10:30:41 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rB77116c1841bf503d724a5676042b6451d167d4fe

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
#	release/scripts/startup/nodeitems_builtins.py
#	source/blender/blenkernel/BKE_node.h
#	source/blender/blenkernel/intern/node.cc

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 9f50960fc59,b1ed1441245..d7bc2cb2777
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -546,11 -547,7 +547,10 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeTriangulate"),
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
-         NodeItem("GeometryNodeSubdivide"),
-         NodeItem("GeometryNodeDecimate"),
+         NodeItem("GeometryNodeMeshSubdivide"),
 +        NodeItem("GeometryNodeCollapse"),
 +        NodeItem("GeometryNodeUnsubdivide"),
 +        NodeItem("GeometryNodeDissolve"),
      ]),
      GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
diff --cc source/blender/blenkernel/BKE_node.h
index 76d7cef88ce,c9f724036e0..5092ab6a7a5
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1457,9 -1457,8 +1457,10 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
  #define GEO_NODE_VIEWER 1067
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
- #define GEO_NODE_COLLAPSE 1069
- #define GEO_NODE_UNSUBDIVIDE 1070
- #define GEO_NODE_DISSOLVE 1071
+ #define GEO_NODE_CURVE_ENDPOINTS 1069
 -
++#define GEO_NODE_COLLAPSE 1070
++#define GEO_NODE_UNSUBDIVIDE 1071
++#define GEO_NODE_DISSOLVE 1072
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index d872a520207,5bed5b1aaad..649ac0d3302
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5110,12 -5102,11 +5102,12 @@@ static void registerGeometryNodes(
    register_node_type_geo_attribute_transfer();
    register_node_type_geo_attribute_vector_math();
    register_node_type_geo_attribute_vector_rotate();
-   register_node_type_geo_attribute_remove();
    register_node_type_geo_boolean();
    register_node_type_geo_bounding_box();
 +  register_node_type_geo_collapse();
    register_node_type_geo_collection_info();
    register_node_type_geo_convex_hull();
+   register_node_type_geo_curve_endpoints();
    register_node_type_geo_curve_length();
    register_node_type_geo_curve_primitive_bezier_segment();
    register_node_type_geo_curve_primitive_circle();
@@@ -5126,9 -5117,8 +5118,9 @@@
    register_node_type_geo_curve_resample();
    register_node_type_geo_curve_reverse();
    register_node_type_geo_curve_subdivide();
+   register_node_type_geo_curve_to_mesh();
+   register_node_type_geo_curve_to_points();
 +  register_node_type_geo_dissolve();
    register_node_type_geo_delete_geometry();
    register_node_type_geo_edge_split();
    register_node_type_geo_input_material();
diff --cc source/blender/nodes/CMakeLists.txt
index ac7ffca8f59,ec060de916b..98b62137d33
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -175,10 -175,9 +176,10 @@@ set(SR
    geometry/nodes/node_geo_curve_resample.cc
    geometry/nodes/node_geo_curve_reverse.cc
    geometry/nodes/node_geo_curve_subdivide.cc
+   geometry/nodes/node_geo_curve_to_mesh.cc
+   geometry/nodes/node_geo_curve_to_points.cc
    geometry/nodes/node_geo_delete_geometry.cc
 +  geometry/nodes/node_geo_dissolve.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 e341006ec1c,d93ecf36442..21803c7dd29
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -46,12 -47,11 +47,12 @@@ void register_node_type_geo_attribute_s
  void register_node_type_geo_attribute_transfer(void);
  void register_node_type_geo_attribute_vector_math(void);
  void register_node_type_geo_attribute_vector_rotate(void);
- void register_node_type_geo_attribute_remove(void);
  void register_node_type_geo_boolean(void);
  void register_node_type_geo_bounding_box(void);
 +void register_node_type_geo_collapse(void);
  void register_node_type_geo_collection_info(void);
  void register_node_type_geo_convex_hull(void);
+ void register_node_type_geo_curve_endpoints(void);
  void register_node_type_geo_curve_length(void);
  void register_node_type_geo_curve_primitive_bezier_segment(void);
  void register_node_type_geo_curve_primitive_circle(void);
@@@ -62,11 -62,9 +63,11 @@@ void register_node_type_geo_curve_primi
  void register_node_type_geo_curve_resample(void);
  void register_node_type_geo_curve_reverse(void);
  void register_node_type_geo_curve_subdivide(void);
+ void register_node_type_geo_curve_to_mesh(void);
+ void register_node_type_geo_curve_to_points(void);
  void register_node_type_geo_delete_geometry(void);
 +void register_node_type_geo_decimate(void);
 +void register_node_type_geo_dissolve(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 f0981eb2df8,6266126a7b0..b8e5c954b5a
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -302,9 -301,9 +302,10 @@@ DefNode(GeometryNode, GEO_NODE_CURVE_PR
  DefNode(GeometryNode, GEO_NODE_CURVE_RESAMPLE, def_geo_curve_resample, "CURVE_RESAMPLE", CurveResample, "Resample Curve", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_SUBDIVIDE, def_geo_curve_subdivide, "CURVE_SUBDIVIDE", CurveSubdivide, "Curve Subdivide", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")
 +DefNode(GeometryNode, GEO_NODE_DISSOLVE, def_geo_dissolve, "DISSOLVE", Dissolve, "Dissolve", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_REVERSE, 0, "CURVE_REVERSE", CurveReverse, "Curve Reverse", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS, def_geo_curve_to_points, "CURVE_TO_POINTS", CurveToPoints, "Curve to Points", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_ENDPOINTS, 0, "CURVE_ENDPOINTS", CurveEndpoints, "Curve Endpoints", "")
  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", "")