[Bf-blender-cvs] [dea495fd3ab] soc-2021-curve-fillet: Merge branch 'master' into soc-2021-curve-fillet

[dilithjay]

Commit: dea495fd3ab41d4f857d06642adb8921f51b12b8
Author: dilithjay
Date:   Sun Aug 8 22:26:42 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rBdea495fd3ab41d4f857d06642adb8921f51b12b8

Merge branch 'master' into soc-2021-curve-fillet

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 3abb7f0a012,9c67ab1e57f..53ca790667c
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -510,8 -510,9 +510,10 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeCurveTrim"),
          NodeItem("GeometryNodeCurveLength"),
          NodeItem("GeometryNodeCurveReverse"),
+         NodeItem("GeometryNodeCurveSplineType"),
          NodeItem("GeometryNodeCurveSetHandles"),
 +        NodeItem("GeometryNodeCurveFillet"),
+         NodeItem("GeometryNodeCurveSelectHandles"),
      ]),
      GeometryNodeCategory("GEO_PRIMITIVES_CURVE", "Curve Primitives", items=[
          NodeItem("GeometryNodeCurvePrimitiveLine"),
diff --cc source/blender/blenkernel/BKE_node.h
index 09288a874dc,caa7ab6de0a..202da974adc
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1475,7 -1475,8 +1475,9 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
  #define GEO_NODE_CURVE_TRIM 1071
  #define GEO_NODE_CURVE_SET_HANDLES 1072
- #define GEO_NODE_CURVE_FILLET 1073
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_CURVE_FILLET 1075
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index ed2c6116f7a,4aec5a9e667..f9a6cd593a8
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5149,8 -5149,8 +5149,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_curve_resample();
    register_node_type_geo_curve_reverse();
    register_node_type_geo_curve_set_handles();
+   register_node_type_geo_curve_spline_type();
    register_node_type_geo_curve_subdivide();
 +  register_node_type_geo_curve_fillet();
    register_node_type_geo_curve_to_mesh();
    register_node_type_geo_curve_to_points();
    register_node_type_geo_curve_trim();
diff --cc source/blender/nodes/CMakeLists.txt
index 8e955787d1c,46fb9f54bfe..23bb3b99e8e
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -175,9 -175,10 +175,11 @@@ set(SR
    geometry/nodes/node_geo_curve_primitive_star.cc
    geometry/nodes/node_geo_curve_resample.cc
    geometry/nodes/node_geo_curve_reverse.cc
+   geometry/nodes/node_geo_curve_select_by_handle_type.cc
    geometry/nodes/node_geo_curve_set_handles.cc
+   geometry/nodes/node_geo_curve_spline_type.cc
    geometry/nodes/node_geo_curve_subdivide.cc
 +  geometry/nodes/node_geo_curve_fillet.cc
    geometry/nodes/node_geo_curve_to_mesh.cc
    geometry/nodes/node_geo_curve_to_points.cc
    geometry/nodes/node_geo_curve_trim.cc
diff --cc source/blender/nodes/NOD_geometry.h
index bfb37733a8f,856d787c8d0..7f25e861a9b
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -63,8 -63,8 +63,9 @@@ 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_set_handles(void);
+ void register_node_type_geo_curve_spline_type(void);
  void register_node_type_geo_curve_subdivide(void);
 +void register_node_type_geo_curve_fillet(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_trim(void);
diff --cc source/blender/nodes/NOD_static_types.h
index 016d7c4f7cf,3852819746e..a0a2f745934
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -303,8 -303,9 +303,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_REVERSE, 0, "CURVE_REVERSE", CurveReverse, "Curve Reverse", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_SET_HANDLES, def_geo_curve_set_handles, "CURVE_SET_HANDLES", CurveSetHandles, "Set Handle Type", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_SELECT_HANDLES, def_geo_curve_select_handles, "CURVE_SELECT_HANDLES", CurveSelectHandles, "Select by Handle Type", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_SPLINE_TYPE, def_geo_curve_spline_type, "CURVE_SPLINE_TYPE", CurveSplineType, "Set Spline Type", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_SUBDIVIDE, def_geo_curve_subdivide, "CURVE_SUBDIVIDE", CurveSubdivide, "Curve Subdivide", "")
 +DefNode(GeometryNode, GEO_NODE_CURVE_FILLET, def_geo_curve_fillet, "CURVE_FILLET", CurveFillet, "Curve Fillet", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS, def_geo_curve_to_points, "CURVE_TO_POINTS", CurveToPoints, "Curve to Points", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "")