[Bf-blender-cvs] [ad16b2c5153] master: Fix T80895: Complex solidify compare edges by content

Henrik Dick noreply at git.blender.org
Mon Oct 5 14:58:22 CEST 2020


Commit: ad16b2c51532fd8f401d981e421367407bf84e94
Author: Henrik Dick
Date:   Fri Oct 2 00:17:53 2020 +0200
Branches: master
https://developer.blender.org/rBad16b2c51532fd8f401d981e421367407bf84e94

Fix T80895: Complex solidify compare edges by content

Even if the index of the edge is not equal the content can be equal
if it has been merged. So compare the content.

Ref D8931

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

M	source/blender/modifiers/intern/MOD_solidify_nonmanifold.c

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

diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
index 463b55b1ccc..20db13d4540 100644
--- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
+++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
@@ -619,7 +619,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
                       uint *e_adj_faces_faces = e_adj_faces->faces;
                       bool *e_adj_faces_reversed = e_adj_faces->faces_reversed;
                       const uint faces_len = e_adj_faces->faces_len;
-                      if (e != i) {
+                      if (e_adj_faces_faces != adj_faces->faces) {
                         /* Find index of e in #adj_faces. */
                         for (face_index = 0;
                              face_index < faces_len && e_adj_faces_faces[face_index] != face;



More information about the Bf-blender-cvs mailing list