[Bf-blender-cvs] [d3aaa7d5236] master: Fix: Build issue with VS2019

[Ray Molenkamp]

Commit: d3aaa7d52365d751852c065cb8bd3db991b3f2af
Author: Ray Molenkamp
Date:   Wed Jan 18 12:41:09 2023 -0700
Branches: master
https://developer.blender.org/rBd3aaa7d52365d751852c065cb8bd3db991b3f2af

Fix: Build issue with VS2019

fix by @JacquesLucke I just sprinkled it to all places
it needed to be.

===================================================================

M	source/blender/blenkernel/intern/curves_geometry.cc
M	source/blender/geometry/intern/subdivide_curves.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/curves_geometry.cc b/source/blender/blenkernel/intern/curves_geometry.cc
index 3ca951858c6..b2cd7cf5cae 100644
--- a/source/blender/blenkernel/intern/curves_geometry.cc
+++ b/source/blender/blenkernel/intern/curves_geometry.cc
@@ -554,7 +554,7 @@ void CurvesGeometry::ensure_nurbs_basis_cache() const
     this->runtime->nurbs_basis_cache.resize(this->curves_num());
     MutableSpan<curves::nurbs::BasisCache> basis_caches(this->runtime->nurbs_basis_cache);
 
-    const OffsetIndices points_by_curve = this->points_by_curve();
+    const OffsetIndices<int> points_by_curve = this->points_by_curve();
     VArray<bool> cyclic = this->cyclic();
     VArray<int8_t> orders = this->nurbs_orders();
     VArray<int8_t> knots_modes = this->nurbs_knots_modes();
@@ -600,7 +600,7 @@ Span<float3> CurvesGeometry::evaluated_positions() const
     MutableSpan<float3> evaluated_positions = this->runtime->evaluated_position_cache;
     this->runtime->evaluated_positions_span = evaluated_positions;
 
-    const OffsetIndices points_by_curve = this->points_by_curve();
+    const OffsetIndices<int> points_by_curve = this->points_by_curve();
     VArray<int8_t> types = this->curve_types();
     VArray<bool> cyclic = this->cyclic();
     VArray<int> resolution = this->resolution();
@@ -681,7 +681,7 @@ Span<float3> CurvesGeometry::evaluated_tangents() const
     Vector<int64_t> bezier_indices;
     const IndexMask bezier_mask = this->indices_for_curve_type(CURVE_TYPE_BEZIER, bezier_indices);
     if (!bezier_mask.is_empty()) {
-      const OffsetIndices points_by_curve = this->points_by_curve();
+      const OffsetIndices<int> points_by_curve = this->points_by_curve();
       const Span<float3> positions = this->positions();
       const Span<float3> handles_left = this->handle_positions_left();
       const Span<float3> handles_right = this->handle_positions_right();
@@ -758,7 +758,7 @@ static void evaluate_generic_data_for_curve(
 Span<float3> CurvesGeometry::evaluated_normals() const
 {
   this->runtime->normal_cache_mutex.ensure([&]() {
-    const OffsetIndices points_by_curve = this->points_by_curve();
+    const OffsetIndices<int> points_by_curve = this->points_by_curve();
     const VArray<int8_t> types = this->curve_types();
     const VArray<bool> cyclic = this->cyclic();
     const VArray<int8_t> normal_mode = this->normal_mode();
diff --git a/source/blender/geometry/intern/subdivide_curves.cc b/source/blender/geometry/intern/subdivide_curves.cc
index 15c3f40e6b2..cdb0ed59b00 100644
--- a/source/blender/geometry/intern/subdivide_curves.cc
+++ b/source/blender/geometry/intern/subdivide_curves.cc
@@ -372,14 +372,14 @@ bke::CurvesGeometry subdivide_curves(
     const VArraySpan<int8_t> src_types_r{src_curves.handle_types_right()};
     const Span<float3> src_handles_l = src_curves.handle_positions_left();
     const Span<float3> src_handles_r = src_curves.handle_positions_right();
-    const OffsetIndices src_points_by_curve = src_curves.points_by_curve();
+    const OffsetIndices<int> src_points_by_curve = src_curves.points_by_curve();
 
     MutableSpan<float3> dst_positions = dst_curves.positions_for_write();
     MutableSpan<int8_t> dst_types_l = dst_curves.handle_types_left_for_write();
     MutableSpan<int8_t> dst_types_r = dst_curves.handle_types_right_for_write();
     MutableSpan<float3> dst_handles_l = dst_curves.handle_positions_left_for_write();
     MutableSpan<float3> dst_handles_r = dst_curves.handle_positions_right_for_write();
-    const OffsetIndices dst_points_by_curve = dst_curves.points_by_curve();
+    const OffsetIndices<int> dst_points_by_curve = dst_curves.points_by_curve();
 
     threading::parallel_for(selection.index_range(), 512, [&](IndexRange range) {
       for (const int curve_i : selection.slice(range)) {