Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Trickey <howard.trickey@gmail.com>2021-10-03 18:26:48 +0300
committerHoward Trickey <howard.trickey@gmail.com>2021-10-03 18:30:40 +0300
commit98fe05fb5b9e1e2ee184444ff56806fa66de2615 (patch)
tree81bb38fadab4b9abf824ab1dea1e33b8b28318b6
parent1833ebea31a73ff8a76d4742c51bad4dfc318cff (diff)
Fix T91810 Bevel not working well with certain unbeveled edge positions.
A previous commit, c56526d8b68ab, which sometimes didn't drop offsets into 'in plane' faces, as a fix to T71329, was overly aggressive. If all the intermediate edges are in the same plane then it is fine to just put the meeting point on the plane of the start and end edges.
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 1f759e9ef43..8bd498a08bd 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -3048,7 +3048,9 @@ static void build_boundary(BevelParams *bp, BevVert *bv, bool construct)
}
}
else {
- offset_meet(bp, e, e2, bv->v, e->fnext, true, co, eip);
+ /* Since all edges between e and e2 are in the same plane, it is OK
+ * to treat this like the case where there are no edges between. */
+ offset_meet(bp, e, e2, bv->v, e->fnext, false, co, NULL);
}
}