diff options
Diffstat (limited to 'source/blender/editors')
5 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index dd7edf66920..2ac1a576286 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -544,7 +544,7 @@ static int snap_curves_to_surface_exec(bContext *C, wmOperator *op) MeshComponent surface_mesh_component; surface_mesh_component.replace(&surface_mesh, GeometryOwnershipType::ReadOnly); - VArray_Span<float2> surface_uv_map; + VArraySpan<float2> surface_uv_map; if (curves_id.surface_uv_map != nullptr) { surface_uv_map = surface_mesh_component .attribute_try_get_for_read( diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index bac03de77e7..b7f496889c0 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -174,7 +174,7 @@ struct AddOperationExecutor { } /* Find UV map. */ - VArray_Span<float2> surface_uv_map; + VArraySpan<float2> surface_uv_map; if (curves_id_->surface_uv_map != nullptr) { MeshComponent surface_component; surface_component.replace(surface_, GeometryOwnershipType::ReadOnly); diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc index 120a7802580..be936b4cbda 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc @@ -64,7 +64,7 @@ struct DensityAddOperationExecutor { Mesh *surface_ = nullptr; Span<MLoopTri> surface_looptris_; Span<float3> corner_normals_su_; - VArray_Span<float2> surface_uv_map_; + VArraySpan<float2> surface_uv_map_; const CurvesSculpt *curves_sculpt_ = nullptr; const Brush *brush_ = nullptr; @@ -226,7 +226,7 @@ struct DensityAddOperationExecutor { } /* Find UV map. */ - VArray_Span<float2> surface_uv_map; + VArraySpan<float2> surface_uv_map; if (curves_id_->surface_uv_map != nullptr) { MeshComponent surface_component; surface_component.replace(surface_, GeometryOwnershipType::ReadOnly); diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index 3e1949cbf34..2739b5869d5 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -87,7 +87,7 @@ struct SlideOperationExecutor { Object *surface_ob_ = nullptr; Mesh *surface_ = nullptr; Span<MLoopTri> surface_looptris_; - VArray_Span<float2> surface_uv_map_; + VArraySpan<float2> surface_uv_map_; VArray<float> curve_factors_; VArray<float> point_factors_; diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc index 9a3f2b9b708..50f8854d90f 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc @@ -113,7 +113,7 @@ static bool vertex_paint_from_weight(Object *ob) return false; } - GVArray_GSpan interpolated{component.attribute_try_adapt_domain( + GVArraySpan interpolated{component.attribute_try_adapt_domain( vertex_group, ATTR_DOMAIN_POINT, color_attribute.domain)}; color_attribute.varray.set_all(interpolated.data()); |