[Bf-blender-cvs] [db384d4df6c] temp-geometry-nodes-curve-sample: Merge branch 'master' into temp-geometry-nodes-curve-sample

[Hans Goudey]

Commit: db384d4df6c0aca209554573e2fe85efa9f0cd0d
Author: Hans Goudey
Date:   Sun Jul 18 19:29:49 2021 -0400
Branches: temp-geometry-nodes-curve-sample
https://developer.blender.org/rBdb384d4df6c0aca209554573e2fe85efa9f0cd0d

Merge branch 'master' into temp-geometry-nodes-curve-sample

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 5e977fbc0cd,9b8eca77e6b..39024445808
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1459,7 -1464,7 +1464,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
  #define GEO_NODE_CURVE_ENDPOINTS 1069
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
- #define GEO_NODE_CURVE_SAMPLE 1071
+ #define GEO_NODE_CURVE_TRIM 1071
++#define GEO_NODE_CURVE_SAMPLE 1072
  
  /** \} */
  
diff --cc source/blender/makesdna/DNA_node_types.h
index 1f75006bd07,2b8e48557b6..e325a22a74d
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -1390,8 -1385,13 +1390,13 @@@ typedef struct NodeGeometryCurveSubdivi
    uint8_t cuts_type;
  } NodeGeometryCurveSubdivide;
  
+ typedef struct NodeGeometryCurveTrim {
+   /* GeometryNodeCurveInterpolateMode. */
+   uint8_t mode;
+ } NodeGeometryCurveTrim;
+ 
  typedef struct NodeGeometryCurveToPoints {
 -  /* GeometryNodeCurveSampleMode. */
 +  /* GeometryNodeCurveResampleMode. */
    uint8_t mode;
  } NodeGeometryCurveToPoints;
  
@@@ -1943,17 -1943,17 +1948,22 @@@ typedef enum GeometryNodeCurvePrimitive
    GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT_OFFSET = 1,
  } GeometryNodeCurvePrimitiveBezierSegmentMode;
  
 +typedef enum GeometryNodeCurveResampleMode {
 +  GEO_NODE_CURVE_RESAMPLE_COUNT = 0,
 +  GEO_NODE_CURVE_RESAMPLE_LENGTH = 1,
 +  GEO_NODE_CURVE_RESAMPLE_EVALUATED = 2,
 +} GeometryNodeCurveResampleMode;
 +
  typedef enum GeometryNodeCurveSampleMode {
 -  GEO_NODE_CURVE_SAMPLE_COUNT = 0,
 +  GEO_NODE_CURVE_SAMPLE_FACTOR = 0,
    GEO_NODE_CURVE_SAMPLE_LENGTH = 1,
 -  GEO_NODE_CURVE_SAMPLE_EVALUATED = 2,
  } GeometryNodeCurveSampleMode;
  
+ typedef enum GeometryNodeCurveInterpolateMode {
+   GEO_NODE_CURVE_INTERPOLATE_FACTOR = 0,
+   GEO_NODE_CURVE_INTERPOLATE_LENGTH = 1,
+ } GeometryNodeCurveInterpolateMode;
+ 
  typedef enum GeometryNodeAttributeTransferMapMode {
    GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED = 0,
    GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST = 1,
diff --cc source/blender/nodes/NOD_static_types.h
index c24763baa1e,42a0454d3e6..dd158cdaf75
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -300,9 -300,9 +300,10 @@@ 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_SAMPLE, def_geo_curve_sample, "CURVE_SAMPLE", CurveSample, "Curve Sample", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_SUBDIVIDE, def_geo_curve_subdivide, "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_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_REVERSE, 0, "CURVE_REVERSE", CurveReverse, "Curve Reverse", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS, def_geo_curve_to_points, "CURVE_TO_POINTS", CurveToPoints, "Curve to Points", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_ENDPOINTS, 0, "CURVE_ENDPOINTS", CurveEndpoints, "Curve Endpoints", "")