diff options
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_fair.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_fair.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index 41dcb3501cc..960e6c43103 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -26,6 +26,7 @@ #include "MEM_guardedalloc.h" #include "eigen_capi.h" +using blender::Array; using blender::Map; using blender::MutableSpan; using blender::Span; @@ -82,7 +83,7 @@ class FairingContext { LoopWeight *loop_weight) { - fair_verts_ex(affected, (int)depth, vertex_weight, loop_weight); + fair_verts_ex(affected, int(depth), vertex_weight, loop_weight); } protected: @@ -220,12 +221,7 @@ class MeshFairingContext : public FairingContext { } } - loop_to_poly_map_.reserve(mesh->totloop); - for (int i = 0; i < mesh->totpoly; i++) { - for (int l = 0; l < mpoly_[i].totloop; l++) { - loop_to_poly_map_[l + mpoly_[i].loopstart] = i; - } - } + loop_to_poly_map_ = blender::bke::mesh_topology::build_loop_to_poly_map(mpoly_, mloop_.size()); } ~MeshFairingContext() override @@ -259,7 +255,7 @@ class MeshFairingContext : public FairingContext { Span<MLoop> mloop_; Span<MPoly> mpoly_; Span<MEdge> medge_; - Vector<int> loop_to_poly_map_; + Array<int> loop_to_poly_map_; }; class BMeshFairingContext : public FairingContext { @@ -444,7 +440,7 @@ class VoronoiVertexWeight : public VertexWeight { class UniformLoopWeight : public LoopWeight { public: - float weight_at_index(const int UNUSED(index)) override + float weight_at_index(const int /*index*/) override { return 1.0f; } |