[Bf-blender-cvs] [bb83e1ef48a] refactor-mesh-corners-generic: Merge branch 'refactor-mesh-position-generic' into refactor-mesh-corners-generic

[Hans Goudey]

Commit: bb83e1ef48a0ff0bd34bd5986e389250319880a0
Author: Hans Goudey
Date:   Wed Jan 4 20:27:39 2023 -0500
Branches: refactor-mesh-corners-generic
https://developer.blender.org/rBbb83e1ef48a0ff0bd34bd5986e389250319880a0

Merge branch 'refactor-mesh-position-generic' into refactor-mesh-corners-generic

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



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

diff --cc source/blender/blenkernel/intern/mesh_normals.cc
index 554604ba3c2,474f35bf80d..86d0fde9637
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@@ -925,10 -921,10 +925,10 @@@ static void loop_manifold_fan_around_ve
    BLI_assert(*r_mlfan_curr_index >= 0);
    BLI_assert(*r_mpfan_curr_index >= 0);
  
 -  const uint vert_fan_next = loops[*r_mlfan_curr_index].v;
 +  const uint vert_fan_next = corner_verts[*r_mlfan_curr_index];
    const MPoly &mpfan_next = polys[*r_mpfan_curr_index];
    if ((vert_fan_orig == vert_fan_next && vert_fan_orig == mv_pivot_index) ||
-       (vert_fan_orig != vert_fan_next && vert_fan_orig != mv_pivot_index)) {
+       (!ELEM(vert_fan_orig, vert_fan_next, mv_pivot_index))) {
      /* We need the previous loop, but current one is our vertex's loop. */
      *r_mlfan_vert_index = *r_mlfan_curr_index;
      if (--(*r_mlfan_curr_index) < mpfan_next.loopstart) {