diff options
Diffstat (limited to 'source/blender/geometry')
6 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/geometry/intern/add_curves_on_mesh.cc b/source/blender/geometry/intern/add_curves_on_mesh.cc index 7490694bf12..e06ee55afa0 100644 --- a/source/blender/geometry/intern/add_curves_on_mesh.cc +++ b/source/blender/geometry/intern/add_curves_on_mesh.cc @@ -245,7 +245,7 @@ AddCurvesOnMeshOutputs add_curves_on_mesh(CurvesGeometry &curves, Vector<float2> used_uvs; /* Find faces that the passed in uvs belong to. */ - const Span<MVert> surface_verts = inputs.surface->vertices(); + const Span<MVert> surface_verts = inputs.surface->verts(); const Span<MLoop> surface_loops = inputs.surface->loops(); for (const int i : inputs.uvs.index_range()) { const float2 &uv = inputs.uvs[i]; diff --git a/source/blender/geometry/intern/mesh_merge_by_distance.cc b/source/blender/geometry/intern/mesh_merge_by_distance.cc index ad39f686dd4..831241aa274 100644 --- a/source/blender/geometry/intern/mesh_merge_by_distance.cc +++ b/source/blender/geometry/intern/mesh_merge_by_distance.cc @@ -1166,7 +1166,7 @@ static void weld_mesh_context_create(const Mesh &mesh, { const int mvert_len = mesh.totvert; const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); Vector<WeldVert> wvert = weld_vert_ctx_alloc_and_setup(vert_dest_map, vert_kill_len); @@ -1360,7 +1360,7 @@ static Mesh *create_merged_mesh(const Mesh &mesh, MutableSpan<int> vert_dest_map, const int removed_vertex_count) { - const Span<MPoly> src_polys = mesh.polygons(); + const Span<MPoly> src_polys = mesh.polys(); const Span<MLoop> src_loops = mesh.loops(); const int totvert = mesh.totvert; const int totedge = mesh.totedge; @@ -1376,7 +1376,7 @@ static Mesh *create_merged_mesh(const Mesh &mesh, Mesh *result = BKE_mesh_new_nomain_from_template( &mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys); MutableSpan<MEdge> dst_edges = result->edges_for_write(); - MutableSpan<MPoly> dst_polys = result->polygons_for_write(); + MutableSpan<MPoly> dst_polys = result->polys_for_write(); MutableSpan<MLoop> dst_loops = result->loops_for_write(); /* Vertices. */ @@ -1570,7 +1570,7 @@ std::optional<Mesh *> mesh_merge_by_distance_all(const Mesh &mesh, KDTree_3d *tree = BLI_kdtree_3d_new(selection.size()); - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); for (const int i : selection) { BLI_kdtree_3d_insert(tree, i, verts[i].co); } @@ -1597,7 +1597,7 @@ std::optional<Mesh *> mesh_merge_by_distance_connected(const Mesh &mesh, const float merge_distance, const bool only_loose_edges) { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MEdge> edges = mesh.edges(); int vert_kill_len = 0; diff --git a/source/blender/geometry/intern/mesh_primitive_cuboid.cc b/source/blender/geometry/intern/mesh_primitive_cuboid.cc index 1e734a82e43..528a9e72e9e 100644 --- a/source/blender/geometry/intern/mesh_primitive_cuboid.cc +++ b/source/blender/geometry/intern/mesh_primitive_cuboid.cc @@ -405,8 +405,8 @@ Mesh *create_cuboid_mesh(const float3 &size, Mesh *mesh = BKE_mesh_new_nomain( config.vertex_count, 0, 0, config.loop_count, config.poly_count); - MutableSpan<MVert> verts = mesh->vertices_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); calculate_vertices(config, verts); diff --git a/source/blender/geometry/intern/mesh_to_curve_convert.cc b/source/blender/geometry/intern/mesh_to_curve_convert.cc index 1951c960d0d..dab373f475b 100644 --- a/source/blender/geometry/intern/mesh_to_curve_convert.cc +++ b/source/blender/geometry/intern/mesh_to_curve_convert.cc @@ -224,7 +224,7 @@ static Vector<std::pair<int, int>> get_selected_edges(const Mesh &mesh, const In bke::CurvesGeometry mesh_to_curve_convert(const Mesh &mesh, const IndexMask selection) { Vector<std::pair<int, int>> selected_edges = get_selected_edges(mesh, selection); - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); CurveFromEdgesOutput output = edges_to_curve_point_indices(verts, selected_edges); return create_curve_from_vert_indices( diff --git a/source/blender/geometry/intern/mesh_to_volume.cc b/source/blender/geometry/intern/mesh_to_volume.cc index 39078b1c511..0c0d550fc99 100644 --- a/source/blender/geometry/intern/mesh_to_volume.cc +++ b/source/blender/geometry/intern/mesh_to_volume.cc @@ -30,7 +30,7 @@ class OpenVDBMeshAdapter { }; OpenVDBMeshAdapter::OpenVDBMeshAdapter(const Mesh &mesh, float4x4 transform) - : vertices_(mesh.vertices()), loops_(mesh.loops()), transform_(transform) + : vertices_(mesh.verts()), loops_(mesh.loops()), transform_(transform) { /* This only updates a cache and can be considered to be logically const. */ const MLoopTri *looptris = BKE_mesh_runtime_looptri_ensure(&mesh); diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index 8d1c43866eb..b230b938ee9 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -864,9 +864,9 @@ static AllMeshesInfo preprocess_meshes(const GeometrySet &geometry_set, MeshRealizeInfo &mesh_info = info.realize_info[mesh_index]; const Mesh *mesh = info.order[mesh_index]; mesh_info.mesh = mesh; - mesh_info.verts = mesh->vertices(); + mesh_info.verts = mesh->verts(); mesh_info.edges = mesh->edges(); - mesh_info.polys = mesh->polygons(); + mesh_info.polys = mesh->polys(); mesh_info.loops = mesh->loops(); /* Create material index mapping. */ @@ -1046,9 +1046,9 @@ static void execute_realize_mesh_tasks(const RealizeInstancesOptions &options, MeshComponent &dst_component = r_realized_geometry.get_component_for_write<MeshComponent>(); dst_component.replace(dst_mesh); bke::MutableAttributeAccessor dst_attributes = bke::mesh_attributes_for_write(*dst_mesh); - MutableSpan<MVert> dst_verts = dst_mesh->vertices_for_write(); + MutableSpan<MVert> dst_verts = dst_mesh->verts_for_write(); MutableSpan<MEdge> dst_edges = dst_mesh->edges_for_write(); - MutableSpan<MPoly> dst_polys = dst_mesh->polygons_for_write(); + MutableSpan<MPoly> dst_polys = dst_mesh->polys_for_write(); MutableSpan<MLoop> dst_loops = dst_mesh->loops_for_write(); /* Copy settings from the first input geometry set with a mesh. */ |