diff options
author | Hans Goudey <h.goudey@me.com> | 2021-11-16 23:55:13 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-11-16 23:55:13 +0300 |
commit | c9fb08e075733fbba11be3dd1881fb3422fc6b94 (patch) | |
tree | c8bfd87b1a6ef7728ea3dbc10d578cc007bfe0c5 /source/blender/blenkernel/intern | |
parent | 9d7422b817d143b4c50c00c7d5b860a9e414c517 (diff) | |
parent | f30e1fd2f0648d6c88bc61142ecc003ffa33ce11 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/spline_bezier.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/spline_bezier.cc b/source/blender/blenkernel/intern/spline_bezier.cc index 28db3da65d0..0cadab998f5 100644 --- a/source/blender/blenkernel/intern/spline_bezier.cc +++ b/source/blender/blenkernel/intern/spline_bezier.cc @@ -598,7 +598,10 @@ Span<float> BezierSpline::evaluated_mappings() const Span<int> offsets = this->control_point_offsets(); - calculate_mappings_linear_resolution(offsets, size, resolution_, is_cyclic_, mappings); + blender::threading::isolate_task([&]() { + /* Isolate the task, since this is function is multi-threaded and holds a lock. */ + calculate_mappings_linear_resolution(offsets, size, resolution_, is_cyclic_, mappings); + }); mapping_cache_dirty_ = false; return mappings; @@ -634,10 +637,13 @@ Span<float3> BezierSpline::evaluated_positions() const Span<int> offsets = this->control_point_offsets(); const int grain_size = std::max(512 / resolution_, 1); - blender::threading::parallel_for(IndexRange(size - 1), grain_size, [&](IndexRange range) { - for (const int i : range) { - this->evaluate_segment(i, i + 1, positions.slice(offsets[i], offsets[i + 1] - offsets[i])); - } + blender::threading::isolate_task([&]() { + /* Isolate the task, since this is function is multi-threaded and holds a lock. */ + blender::threading::parallel_for(IndexRange(size - 1), grain_size, [&](IndexRange range) { + for (const int i : range) { + this->evaluate_segment(i, i + 1, positions.slice(offsets[i], offsets[i + 1] - offsets[i])); + } + }); }); if (is_cyclic_) { this->evaluate_segment( |