[Bf-blender-cvs] [22de21bef1a] master: Fix: Compiler error on windows and mac
Hans Goudey
noreply at git.blender.org
Wed Mar 16 22:49:41 CET 2022
Commit: 22de21bef1a31718d45e89aedc574055a5983b7d
Author: Hans Goudey
Date: Wed Mar 16 16:49:31 2022 -0500
Branches: master
https://developer.blender.org/rB22de21bef1a31718d45e89aedc574055a5983b7d
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.
===================================================================
M source/blender/blenkernel/intern/curve_bezier.cc
===================================================================
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) {
More information about the Bf-blender-cvs
mailing list