diff options
author | Hans Goudey <h.goudey@me.com> | 2022-03-17 00:49:31 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-03-17 00:49:31 +0300 |
commit | 22de21bef1a31718d45e89aedc574055a5983b7d (patch) | |
tree | 448f1a8a27ad150bba299eb5525d3ff5283408ed /source/blender/blenkernel | |
parent | 7a4af7a01ba9dfc9f84c5c32b8e23b0561d5507c (diff) |
Fix: Compiler error on windows and mac
The previous fix including `<algorithm>` was an improvement
but not the actual error, which appears to be that `int64_t` is
long long int on one platform but just long int on another.
The fix includes the template argument directly.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/curve_bezier.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/curve_bezier.cc b/source/blender/blenkernel/intern/curve_bezier.cc index 04586951aee..43c94fbcd95 100644 --- a/source/blender/blenkernel/intern/curve_bezier.cc +++ b/source/blender/blenkernel/intern/curve_bezier.cc @@ -103,7 +103,7 @@ void calculate_evaluated_positions(const Span<float3> positions, evaluated_positions.take_front(evaluated_offsets.first())); /* Give each task fewer segments as the resolution gets larger. */ - const int grain_size = std::max(evaluated_positions.size() / positions.size() * 32, 1L); + const int grain_size = std::max<int>(evaluated_positions.size() / positions.size() * 32, 1); threading::parallel_for( positions.index_range().drop_back(1).drop_front(1), grain_size, [&](IndexRange range) { for (const int i : range) { |