[Bf-blender-cvs] [03778b787eb] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: 03778b787eb89441500d8209b7b83400e85074a4
Author: Pablo Dobarro
Date:   Sun Feb 7 17:49:48 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB03778b787eb89441500d8209b7b83400e85074a4

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenkernel/intern/mesh_fair.cc
index eac164985c0,ac6dd96ed90..7b850a6f0e8
--- a/source/blender/blenkernel/intern/mesh_fair.cc
+++ b/source/blender/blenkernel/intern/mesh_fair.cc
@@@ -611,12 -475,12 +611,13 @@@ static void prefair_and_fair_vertices(F
  
    /* Fair. */
    VoronoiVertexWeight *voronoi_vertex_weights = new VoronoiVertexWeight(fairing_context);
 -  /* TODO: Implement cotangent loop weights. */
 +  CotangentLoopWeight *cotangent_loop_weights = new CotangentLoopWeight(fairing_context);
++
    fairing_context->fair_vertices(
 -      affected_vertices, depth, voronoi_vertex_weights, uniform_loop_weights);
 +      affected_vertices, depth, voronoi_vertex_weights, cotangent_loop_weights);
  
 -  delete uniform_loop_weights;
    delete voronoi_vertex_weights;
 +  delete cotangent_loop_weights;
  }
  
  void BKE_mesh_prefair_and_fair_vertices(struct Mesh *mesh,