diff options
Diffstat (limited to 'source/blender/editors/sculpt_paint/curves_sculpt_add.cc')
| -rw-r--r-- | source/blender/editors/sculpt_paint/curves_sculpt_add.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index e57a6e43983..809511d0106 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -55,7 +55,7 @@ class AddOperation : public CurvesSculptStrokeOperation { friend struct AddOperationExecutor; public: - ~AddOperation() + ~AddOperation() override { if (curve_roots_kdtree_ != nullptr) { BLI_kdtree_3d_free(curve_roots_kdtree_); @@ -174,8 +174,8 @@ struct AddOperationExecutor { use_interpolation_ = interpolate_length_ || interpolate_shape_; new_curve_length_ = curves_sculpt_->curve_length; - tot_old_curves_ = curves_->curves_size(); - tot_old_points_ = curves_->points_size(); + tot_old_curves_ = curves_->curves_num(); + tot_old_points_ = curves_->points_num(); if (add_amount_ == 0) { return; @@ -216,8 +216,8 @@ struct AddOperationExecutor { const int tot_added_curves = added_points.bary_coords.size(); const int tot_added_points = tot_added_curves * points_per_curve_; - curves_->resize(curves_->points_size() + tot_added_points, - curves_->curves_size() + tot_added_curves); + curves_->resize(curves_->points_num() + tot_added_points, + curves_->curves_num() + tot_added_curves); threading::parallel_invoke([&]() { this->initialize_curve_offsets(tot_added_curves); }, [&]() { this->initialize_attributes(added_points); }); @@ -515,7 +515,7 @@ struct AddOperationExecutor { void ensure_curve_roots_kdtree() { if (self_->curve_roots_kdtree_ == nullptr) { - self_->curve_roots_kdtree_ = BLI_kdtree_3d_new(curves_->curves_size()); + self_->curve_roots_kdtree_ = BLI_kdtree_3d_new(curves_->curves_num()); for (const int curve_i : curves_->curves_range()) { const int root_point_i = curves_->offsets()[curve_i]; const float3 &root_pos_cu = curves_->positions()[root_point_i]; @@ -609,7 +609,7 @@ struct AddOperationExecutor { const Span<NeighborInfo> neighbors = neighbors_per_curve[added_curve_i]; float length_sum = 0.0f; for (const NeighborInfo &neighbor : neighbors) { - const IndexRange neighbor_points = curves_->range_for_curve(neighbor.index); + const IndexRange neighbor_points = curves_->points_for_curve(neighbor.index); float neighbor_length = 0.0f; const int tot_segments = neighbor_points.size() - 1; for (const int segment_i : IndexRange(tot_segments)) { @@ -744,7 +744,7 @@ struct AddOperationExecutor { float normal_rotation_cu[3][3]; rotation_between_vecs_to_mat3(normal_rotation_cu, neighbor_normal_cu, normal_cu); - const IndexRange neighbor_points = curves_->range_for_curve(neighbor_curve_i); + const IndexRange neighbor_points = curves_->points_for_curve(neighbor_curve_i); const float3 &neighbor_root_cu = positions_cu[neighbor_points[0]]; /* Use a temporary #PolySpline, because that's the easiest way to resample an |