[Bf-blender-cvs] [1ab412f13dc] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: 1ab412f13dccfd62c24da1b2f6904866683ef98b
Author: Pablo Dobarro
Date:   Fri Jun 18 21:24:36 2021 +0200
Branches: sculpt-dev
https://developer.blender.org/rB1ab412f13dccfd62c24da1b2f6904866683ef98b

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenkernel/intern/mesh_fair.cc
index 542e3906ed9,6ac1aa9b2b9..e04f7e178ea
--- a/source/blender/blenkernel/intern/mesh_fair.cc
+++ b/source/blender/blenkernel/intern/mesh_fair.cc
@@@ -65,14 -65,8 +65,14 @@@ class FairingContext 
                                            float r_adj_prev[3]) = 0;
  
    /* Get the other vertex index for a loop. */
-   virtual int other_vertex_index_from_loop(const int loop, const unsigned int v) = 0;
+   virtual int other_vertex_index_from_loop(const int loop, const uint v) = 0;
  
 +  virtual float *vertex_deformation_co_get(const int v) = 0;
 +  virtual void vertex_deformation_co_set(const int v, const float co[3]) = 0;
 +
 +  virtual int vertex_index_from_loop(const int loop) = 0;
 +  virtual float cotangent_loop_weight_get(const int loop) = 0;
 +
    int vertex_count_get()
    {
      return totvert_;
@@@ -272,11 -253,11 +272,11 @@@ class MeshFairingContext : public Fairi
      const int vert = mloop_[loop].v;
      const MPoly *p = &mpoly_[loop_to_poly_map_[loop]];
      const int corner = poly_find_loop_from_vert(p, &mloop_[p->loopstart], vert);
 -    copy_v3_v3(r_adj_next, co_[ME_POLY_LOOP_NEXT(mloop_, p, corner)->v]);
 -    copy_v3_v3(r_adj_prev, co_[ME_POLY_LOOP_PREV(mloop_, p, corner)->v]);
 +    copy_v3_v3(r_adj_next, deform_mvert_[ME_POLY_LOOP_NEXT(mloop_, p, corner)->v].co);
 +    copy_v3_v3(r_adj_prev, deform_mvert_[ME_POLY_LOOP_PREV(mloop_, p, corner)->v].co);
    }
  
-   int other_vertex_index_from_loop(const int loop, const unsigned int v) override
+   int other_vertex_index_from_loop(const int loop, const uint v) override
    {
      MEdge *e = &medge_[mloop_[loop].e];
      if (e->v1 == v) {