diff options
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_runtime.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_runtime.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/mesh_runtime.cc b/source/blender/blenkernel/intern/mesh_runtime.cc index e90a298ad8d..86e8eff1bf1 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.cc +++ b/source/blender/blenkernel/intern/mesh_runtime.cc @@ -24,6 +24,7 @@ #include "BKE_shrinkwrap.h" #include "BKE_subdiv_ccg.h" +using blender::float3; using blender::MutableSpan; using blender::Span; @@ -94,14 +95,14 @@ void BKE_mesh_runtime_looptri_recalc(Mesh *mesh) { mesh_ensure_looptri_data(mesh); BLI_assert(mesh->totpoly == 0 || mesh->runtime->looptris.array_wip != nullptr); - const Span<MVert> verts = mesh->verts(); + const Span<float3> positions = mesh->positions(); const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); if (!BKE_mesh_poly_normals_are_dirty(mesh)) { BKE_mesh_recalc_looptri_with_normals(loops.data(), polys.data(), - verts.data(), + reinterpret_cast<const float(*)[3]>(positions.data()), mesh->totloop, mesh->totpoly, mesh->runtime->looptris.array_wip, @@ -110,7 +111,7 @@ void BKE_mesh_runtime_looptri_recalc(Mesh *mesh) else { BKE_mesh_recalc_looptri(loops.data(), polys.data(), - verts.data(), + reinterpret_cast<const float(*)[3]>(positions.data()), mesh->totloop, mesh->totpoly, mesh->runtime->looptris.array_wip); @@ -292,7 +293,7 @@ bool BKE_mesh_runtime_is_valid(Mesh *me_eval) printf("MESH: %s\n", me_eval->id.name + 2); } - MutableSpan<MVert> verts = me_eval->verts_for_write(); + MutableSpan<float3> positions = me_eval->positions_for_write(); MutableSpan<MEdge> edges = me_eval->edges_for_write(); MutableSpan<MPoly> polys = me_eval->polys_for_write(); MutableSpan<MLoop> loops = me_eval->loops_for_write(); @@ -313,8 +314,8 @@ bool BKE_mesh_runtime_is_valid(Mesh *me_eval) is_valid &= BKE_mesh_validate_arrays( me_eval, - verts.data(), - verts.size(), + reinterpret_cast<float(*)[3]>(positions.data()), + positions.size(), edges.data(), edges.size(), static_cast<MFace *>(CustomData_get_layer(&me_eval->fdata, CD_MFACE)), |