blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Hans Goudey 2021-11-11 09:27:42 -06:00
parent ce395c84a3 7aa39b40f4
commit 52c617802f
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/BKE_spline.hh
View File

@ -306,11 +306,23 @@ class BezierSpline final : public Spline {
blender::Span<HandleType> handle_types_left() const;
blender::MutableSpan<HandleType> handle_types_left();
blender::Span<blender::float3> handle_positions_left() const;
blender::MutableSpan<blender::float3> handle_positions_left();
/**
* Get writable access to the hande position.
*
* \param write_only: pass true for an uninitialized spline, this prevents accessing
* uninitialized memory while autogenerating handles.
*/
blender::MutableSpan<blender::float3> handle_positions_left(bool write_only = false);
blender::Span<HandleType> handle_types_right() const;
blender::MutableSpan<HandleType> handle_types_right();
blender::Span<blender::float3> handle_positions_right() const;
blender::MutableSpan<blender::float3> handle_positions_right();
/**
* Get writable access to the hande position.
*
* \param write_only: pass true for an uninitialized spline, this prevents accessing
* uninitialized memory while autogenerating handles.
*/
blender::MutableSpan<blender::float3> handle_positions_right(bool write_only = false);
void ensure_auto_handles() const;
void translate(const blender::float3 &translation) override;

4
source/blender/blenkernel/intern/curve_eval.cc
View File

@ -225,8 +225,8 @@ static SplinePtr spline_from_dna_bezier(const Nurb &nurb)
Span<const BezTriple> src_points{nurb.bezt, nurb.pntsu};
spline->resize(src_points.size());
MutableSpan<float3> positions = spline->positions();
MutableSpan<float3> handle_positions_left = spline->handle_positions_left();
MutableSpan<float3> handle_positions_right = spline->handle_positions_right();
MutableSpan<float3> handle_positions_left = spline->handle_positions_left(true);
MutableSpan<float3> handle_positions_right = spline->handle_positions_right(true);
MutableSpan<BezierSpline::HandleType> handle_types_left = spline->handle_types_left();
MutableSpan<BezierSpline::HandleType> handle_types_right = spline->handle_types_right();
MutableSpan<float> radii = spline->radii();

13
source/blender/blenkernel/intern/spline_bezier.cc
View File

@ -142,11 +142,14 @@ Span<float3> BezierSpline::handle_positions_left() const
this->ensure_auto_handles();
return handle_positions_left_;
}
MutableSpan<float3> BezierSpline::handle_positions_left()
MutableSpan<float3> BezierSpline::handle_positions_left(const bool write_only)
{
this->ensure_auto_handles();
if (!write_only) {
this->ensure_auto_handles();
}
return handle_positions_left_;
}
Span<BezierSpline::HandleType> BezierSpline::handle_types_right() const
{
return handle_types_right_;
@ -160,9 +163,11 @@ Span<float3> BezierSpline::handle_positions_right() const
this->ensure_auto_handles();
return handle_positions_right_;
}
MutableSpan<float3> BezierSpline::handle_positions_right()
MutableSpan<float3> BezierSpline::handle_positions_right(const bool write_only)
{
this->ensure_auto_handles();
if (!write_only) {
this->ensure_auto_handles();
}
return handle_positions_right_;
}