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

[dilithjay]

Commit: d71aaf0d50f4faa5f6a27a6c2225121c776c392b
Author: dilithjay
Date:   Fri Sep 10 21:50:47 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rBd71aaf0d50f4faa5f6a27a6c2225121c776c392b

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

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 5f08c340c0d,c0af91b7ad6..c8f24935f95
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -517,11 -526,6 +526,7 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeCurveFill"),
          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/nodes/NOD_static_types.h
index c0e0a1f3970,a6c4ab342be..ef276361d3c
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -304,12 -304,11 +304,12 @@@ DefNode(GeometryNode, GEO_NODE_CURVE_PR
  DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_SPIRAL, 0, "CURVE_PRIMITIVE_SPIRAL", CurveSpiral, "Curve Spiral", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_STAR, 0, "CURVE_PRIMITIVE_STAR", CurveStar, "Star", "")
  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_SELECT_HANDLES, def_geo_curve_select_handles, "CURVE_SELECT_HANDLES", CurveSelectHandles, "Select by Handle Type", "")
- DefNode(GeometryNode, GEO_NODE_CURVE_SET_HANDLES, def_geo_curve_set_handles, "CURVE_SET_HANDLES", CurveSetHandles, "Set 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_LEGACY_CURVE_REVERSE, 0, "LEGACY_CURVE_REVERSE", LegacyCurveReverse, "Curve Reverse", "")
+ DefNode(GeometryNode, GEO_NODE_LEGACY_CURVE_SELECT_HANDLES, def_geo_curve_select_handles, "LEGACY_CURVE_SELECT_HANDLES", LegacyCurveSelectHandles, "Select by Handle Type", "")
+ DefNode(GeometryNode, GEO_NODE_LEGACY_CURVE_SET_HANDLES, def_geo_curve_set_handles, "LEGACY_CURVE_SET_HANDLES", LegacyCurveSetHandles, "Set Handle Type", "")
+ DefNode(GeometryNode, GEO_NODE_LEGACY_CURVE_SPLINE_TYPE, def_geo_curve_spline_type, "LEGACY_CURVE_SPLINE_TYPE", LegacyCurveSplineType, "Set Spline Type", "")
+ DefNode(GeometryNode, GEO_NODE_LEGACY_CURVE_SUBDIVIDE, def_geo_curve_subdivide, "LEGACY_CURVE_SUBDIVIDE", LegacyCurveSubdivide, "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", "")