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

[dilithjay]

Commit: 625fe5968f1fd1df1b9a72b5ec5a25aeed90a1e5
Author: dilithjay
Date:   Thu Sep 9 18:37:59 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rB625fe5968f1fd1df1b9a72b5ec5a25aeed90a1e5

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index d13441a6959,0d70e812ecb..9d029c069b7
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1484,7 -1484,11 +1484,12 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_SPLINE_TYPE 1073
  #define GEO_NODE_CURVE_SELECT_HANDLES 1074
  #define GEO_NODE_CURVE_FILL 1075
- #define GEO_NODE_CURVE_FILLET 1076
+ #define GEO_NODE_INPUT_POSITION 1076
+ #define GEO_NODE_SET_POSITION 1077
+ #define GEO_NODE_INPUT_INDEX 1078
+ #define GEO_NODE_INPUT_NORMAL 1079
+ #define GEO_NODE_ATTRIBUTE_CAPTURE 1080
++#define GEO_NODE_CURVE_FILLET 1081
  
  /** \} */
  
diff --cc source/blender/nodes/NOD_static_types.h
index d51be850db3,670cde4470e..c0e0a1f3970
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -304,11 -305,10 +305,11 @@@ DefNode(GeometryNode, GEO_NODE_CURVE_PR
  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_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_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_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", "")