Merge branch 'master' into temp-image-buffer-rasterizertemp-image-buffer-rasterizer

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_endpoints.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_endpoints.cc
index b83aa8b69a9..0980c2d6e72 100644
--- a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_endpoints.cc
+++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_endpoints.cc
@@ -137,15 +137,15 @@ static void node_geo_exec(GeoNodeExecParams params)
 
   geometry_set = geometry::realize_instances_legacy(geometry_set);
 
-  if (!geometry_set.has_curve()) {
+  if (!geometry_set.has_curves()) {
     params.set_default_remaining_outputs();
     return;
   }
 
   const CurveComponent &curve_component = *geometry_set.get_component_for_read<CurveComponent>();
-  const CurveEval &curve = *curve_component.get_for_read();
-  const Span<SplinePtr> splines = curve.splines();
-  curve.assert_valid_point_attributes();
+  const std::unique_ptr<CurveEval> curve = curves_to_curve_eval(*curve_component.get_for_read());
+  const Span<SplinePtr> splines = curve->splines();
+  curve->assert_valid_point_attributes();
 
   evaluate_splines(splines);
 
@@ -167,9 +167,9 @@ static void node_geo_exec(GeoNodeExecParams params)
       end_result.get_component_for_write<PointCloudComponent>();
 
   CurveToPointsResults start_attributes = curve_to_points_create_result_attributes(
-      start_point_component, curve);
+      start_point_component, *curve);
   CurveToPointsResults end_attributes = curve_to_points_create_result_attributes(
-      end_point_component, curve);
+      end_point_component, *curve);
 
   copy_endpoint_attributes(splines, offsets.as_span(), start_attributes, end_attributes);
   copy_spline_domain_attributes(curve_component, offsets.as_span(), start_point_component);