diff options
author | Campbell Barton <campbell@blender.org> | 2022-11-10 03:19:36 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-11-10 03:21:18 +0300 |
commit | 9b646cfae521aa380a02107b21e0d90c9d6a7be9 (patch) | |
tree | 7bae12b1c9047c80bdce1481362aa721de63d1ac /source/blender/geometry/intern/trim_curves.cc | |
parent | 2630fdb78763aad053c7b765dbfee77d30f37be8 (diff) | |
parent | 81ca6308d1d70ab23bfba8dcc3368d3f408bfd1f (diff) |
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'source/blender/geometry/intern/trim_curves.cc')
-rw-r--r-- | source/blender/geometry/intern/trim_curves.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/geometry/intern/trim_curves.cc b/source/blender/geometry/intern/trim_curves.cc index 192c47b0d43..c1e65f1e0c7 100644 --- a/source/blender/geometry/intern/trim_curves.cc +++ b/source/blender/geometry/intern/trim_curves.cc @@ -752,16 +752,16 @@ static float trim_sample_length(const Span<float> accumulated_lengths, * Compute the selection for the given curve type. Tracks indices for splitting the selection if * there are curves reduced to a single point. */ -static void compute_curve_trim_parameters(const bke::CurvesGeometry &curves, - const IndexMask selection, - const VArray<float> &starts, - const VArray<float> &ends, - const GeometryNodeCurveSampleMode mode, - MutableSpan<int> dst_curve_size, - MutableSpan<int8_t> dst_curve_types, - MutableSpan<bke::curves::CurvePoint> start_points, - MutableSpan<bke::curves::CurvePoint> end_points, - MutableSpan<bke::curves::IndexRangeCyclic> src_ranges) +void compute_curve_trim_parameters(const bke::CurvesGeometry &curves, + const IndexMask selection, + const VArray<float> &starts, + const VArray<float> &ends, + const GeometryNodeCurveSampleMode mode, + MutableSpan<int> dst_curve_size, + MutableSpan<int8_t> dst_curve_types, + MutableSpan<bke::curves::CurvePoint> start_points, + MutableSpan<bke::curves::CurvePoint> end_points, + MutableSpan<bke::curves::IndexRangeCyclic> src_ranges) { const VArray<bool> src_cyclic = curves.cyclic(); const VArray<int> resolution = curves.resolution(); @@ -785,8 +785,8 @@ static void compute_curve_trim_parameters(const bke::CurvesGeometry &curves, /* Single point. */ dst_curve_size[curve_i] = 1; src_ranges[curve_i] = bke::curves::IndexRangeCyclic(0, 0, 1, 1); - start_points[curve_i] = {{0, 0}, 0.0f}; - end_points[curve_i] = {{0, 0}, 0.0f}; + start_points[curve_i] = {0, 0, 0.0f}; + end_points[curve_i] = {0, 0, 0.0f}; continue; } |