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

[dilithjay]

Commit: 44288a4538613844c3657cf8dce92d0f87c7fe34
Author: dilithjay
Date:   Sun Jul 25 23:10:01 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rB44288a4538613844c3657cf8dce92d0f87c7fe34

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

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 1786f996584,09820291222..3abb7f0a012
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -510,7 -510,7 +510,8 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeCurveTrim"),
          NodeItem("GeometryNodeCurveLength"),
          NodeItem("GeometryNodeCurveReverse"),
+         NodeItem("GeometryNodeCurveSetHandles"),
 +        NodeItem("GeometryNodeCurveFillet"),
      ]),
      GeometryNodeCategory("GEO_PRIMITIVES_CURVE", "Curve Primitives", items=[
          NodeItem("GeometryNodeCurvePrimitiveLine"),
diff --cc source/blender/blenkernel/BKE_node.h
index 105212525bc,cecb3118038..c5d6f129b31
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1465,7 -1465,7 +1465,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_ENDPOINTS 1069
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
  #define GEO_NODE_CURVE_TRIM 1071
- #define GEO_NODE_CURVE_FILLET 1072
+ #define GEO_NODE_CURVE_SET_HANDLES 1072
++#define GEO_NODE_CURVE_FILLET 1073
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 53c38c10650,e9608457896..8fba6780d59
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5117,8 -5119,8 +5119,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_curve_primitive_star();
    register_node_type_geo_curve_resample();
    register_node_type_geo_curve_reverse();
+   register_node_type_geo_curve_set_handles();
    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 0d00e5786a0,36e5be6a292..8e955787d1c
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -175,8 -175,8 +175,9 @@@ 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_set_handles.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 bf35a078813,868fcbb33af..bfb37733a8f
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -62,8 -62,8 +62,9 @@@ void register_node_type_geo_curve_primi
  void register_node_type_geo_curve_primitive_star(void);
  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_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 7cfa23511bf,1298acf475d..8f703ad795f
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -300,8 -300,8 +300,9 @@@ DefNode(GeometryNode, GEO_NODE_CURVE_PR
  DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_STAR, 0, "CURVE_PRIMITIVE_STAR", CurveStar, "Star", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_SPIRAL, 0, "CURVE_PRIMITIVE_SPIRAL", CurveSpiral, "Curve Spiral", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_RESAMPLE, def_geo_curve_resample, "CURVE_RESAMPLE", CurveResample, "Resample Curve", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_SET_HANDLES, def_geo_curve_set_handles, "CURVE_SET_HANDLES", CurveSetHandles, "Set Handle 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_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_REVERSE, 0, "CURVE_REVERSE", CurveReverse, "Curve Reverse", "")