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

[Hans Goudey]

Commit: d7a74a2ad69914602f563852610efff3e8ed6e1c
Author: Hans Goudey
Date:   Mon Jul 12 19:42:26 2021 -0400
Branches: temp-geometry-nodes-curve-sample
https://developer.blender.org/rBd7a74a2ad69914602f563852610efff3e8ed6e1c

Merge branch 'master' into curve-sample-node

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 0f53b76ce15,c9f724036e0..61d26379052
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1444,7 -1455,9 +1455,10 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER 1064
  #define GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT 1065
  #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
- #define GEO_NODE_CURVE_SAMPLE 1067
+ #define GEO_NODE_VIEWER 1067
+ #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
+ #define GEO_NODE_CURVE_ENDPOINTS 1069
++#define GEO_NODE_CURVE_SAMPLE 1070
  
  /** \} */
  
diff --cc source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
index e6e583f939f,bb8f560f92d..4edebf24d6a
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
@@@ -348,14 -330,14 +330,14 @@@ static void geo_node_curve_to_points_ex
    GeometrySet result = GeometrySet::create_with_pointcloud(BKE_pointcloud_new_nomain(total_size));
    PointCloudComponent &point_component = result.get_component_for_write<PointCloudComponent>();
  
-   ResultAttributes new_attributes = create_point_attributes(point_component, curve);
- 
+   CurveToPointsResults new_attributes = curve_to_points_create_result_attributes(point_component,
+                                                                                  curve);
    switch (mode) {
 -    case GEO_NODE_CURVE_SAMPLE_COUNT:
 -    case GEO_NODE_CURVE_SAMPLE_LENGTH:
 +    case GEO_NODE_CURVE_RESAMPLE_COUNT:
 +    case GEO_NODE_CURVE_RESAMPLE_LENGTH:
        copy_uniform_sample_point_attributes(splines, offsets, new_attributes);
        break;
 -    case GEO_NODE_CURVE_SAMPLE_EVALUATED:
 +    case GEO_NODE_CURVE_RESAMPLE_EVALUATED:
        copy_evaluated_point_attributes(splines, offsets, new_attributes);
        break;
    }