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:
authorJeroen Bakker <jeroen@blender.org>2021-06-21 08:55:49 +0300
committerJeroen Bakker <jeroen@blender.org>2021-06-21 08:55:49 +0300
commitb2510b9e20a4b6ce6bee68e89a801c33b4c2bf9d (patch)
tree2b30915cd11a2b4ae74e757d301ada88d7b44918 /source/blender/bmesh
parentfeb6fd632f6d6c645c715c5e5e8bcdb9b3eab057 (diff)
Fix T89271: Selecting all vertices doesn't select all edges.
Mistake in recent commit {rBea4309925f1d2d2a224bd1dce12269a58ade9b62}.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r--source/blender/bmesh/intern/bmesh_marking.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index c58aaf17116..19d94613afe 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -345,10 +345,11 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode, eBMSelectio
/* both loops only set edge/face flags and read off verts */
BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
const bool is_selected = BM_elem_flag_test(e, BM_ELEM_SELECT);
- if (!is_selected &&
+ const bool is_hidden = BM_elem_flag_test(e, BM_ELEM_HIDDEN);
+ if (!is_hidden &&
(BM_elem_flag_test(e->v1, BM_ELEM_SELECT) && BM_elem_flag_test(e->v2, BM_ELEM_SELECT))) {
BM_elem_flag_enable(e, BM_ELEM_SELECT);
- bm->totedgesel += 1;
+ bm->totedgesel += is_selected ? 0 : 1;
}
else {
BM_elem_flag_disable(e, BM_ELEM_SELECT);