[Bf-blender-cvs] [d5a83a5a329] temp-geometry-nodes-fields-prototype: Merge branch 'master' into temp-geometry-nodes-fields-prototype

[Hans Goudey]

Commit: d5a83a5a329b2c748d6a2cbd9620b374fba0c81c
Author: Hans Goudey
Date:   Fri Aug 6 12:33:00 2021 -0500
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rBd5a83a5a329b2c748d6a2cbd9620b374fba0c81c

Merge branch 'master' into temp-geometry-nodes-fields-prototype

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index fb0c11fde69,caa7ab6de0a..ae78ec7bb55
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1475,11 -1475,8 +1475,12 @@@ 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_ATTRIBUTE 1073
- #define GEO_NODE_INDEX 1074
- #define GEO_NODE_EXTRUDE 1075
- #define GEO_NODE_CURVE_SPLINE_TYPE 1076
- #define GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS 1077
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_ATTRIBUTE 1075
++#define GEO_NODE_INDEX 1076
++#define GEO_NODE_EXTRUDE 1077
++#define GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS 1078
  
  /** \} */
  
diff --cc source/blender/nodes/NOD_static_types.h
index b0526fa9bbb,3852819746e..3aac71fd2f9
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -307,8 -303,9 +307,9 @@@ 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_SUBDIVIDE, 0, "CURVE_SUBDIVIDE", CurveSubdivide, "Curve Subdivide", "")
  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", "")