kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'blender-v3.5-release'

Browse Source
This commit is contained in:
Jacques Lucke 2023-02-24 16:43:17 +01:00
commit be94fefeb1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc
View File

@ -99,6 +99,8 @@ static Array<float> calculate_point_lengths(
const Span<float> evaluated_lengths = curves.evaluated_lengths_for_curve(i_curve, is_cyclic); const Span<float> evaluated_lengths = curves.evaluated_lengths_for_curve(i_curve, is_cyclic);
MutableSpan<float> lengths = result.as_mutable_span().slice(points); MutableSpan<float> lengths = result.as_mutable_span().slice(points);
lengths.first() = 0.0f; lengths.first() = 0.0f;
const float last_evaluated_length = evaluated_lengths.is_empty() ? 0.0f :
evaluated_lengths.last();
float total; float total;
switch (types[i_curve]) { switch (types[i_curve]) {
@ -107,19 +109,19 @@ static Array<float> calculate_point_lengths(
for (const int i : IndexRange(points.size()).drop_back(1)) { for (const int i : IndexRange(points.size()).drop_back(1)) {
lengths[i + 1] = evaluated_lengths[resolution * (i + 1) - 1]; lengths[i + 1] = evaluated_lengths[resolution * (i + 1) - 1];
} }
total = evaluated_lengths.last(); total = last_evaluated_length;
break; break;
} }
case CURVE_TYPE_POLY: case CURVE_TYPE_POLY:
lengths.drop_front(1).copy_from(evaluated_lengths.take_front(lengths.size() - 1)); lengths.drop_front(1).copy_from(evaluated_lengths.take_front(lengths.size() - 1));
total = evaluated_lengths.last(); total = last_evaluated_length;
break; break;
case CURVE_TYPE_BEZIER: { case CURVE_TYPE_BEZIER: {
const Span<int> offsets = curves.bezier_evaluated_offsets_for_curve(i_curve); const Span<int> offsets = curves.bezier_evaluated_offsets_for_curve(i_curve);
for (const int i : IndexRange(points.size()).drop_back(1)) { for (const int i : IndexRange(points.size()).drop_back(1)) {
lengths[i + 1] = evaluated_lengths[offsets[i + 1] - 1]; lengths[i + 1] = evaluated_lengths[offsets[i + 1] - 1];
} }
total = evaluated_lengths.last(); total = last_evaluated_length;
break; break;
} }
case CURVE_TYPE_NURBS: { case CURVE_TYPE_NURBS: {