[Bf-blender-cvs] [be619b58886] blender2.8: Fix bug selecting verts in mixed edge/vert mode

Campbell Barton noreply at git.blender.org
Fri Dec 21 08:22:42 CET 2018


Commit: be619b588860d26dc818e518647778f225dc320c
Author: Campbell Barton
Date:   Fri Dec 21 18:16:41 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBbe619b588860d26dc818e518647778f225dc320c

Fix bug selecting verts in mixed edge/vert mode

Own regression from 2.7x when adding multi-object select support.

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

M	source/blender/editors/mesh/editmesh_select.c

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

diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index fdd8a124652..e522c8849c7 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -984,7 +984,7 @@ static bool unified_findnearest(
 			ED_view3d_backbuf_validate(vc);
 			BMFace *efa_zbuf = NULL;
 			BMFace *efa_test = EDBM_face_find_nearest_ex(vc, &dist, dist_center_p, true, use_cycle, &efa_zbuf);
-			if (hit.f.ele && dist_center_p) {
+			if (efa_test && dist_center_p) {
 				dist = min_ff(dist_margin, dist_center);
 			}
 			if (efa_test) {
@@ -1009,7 +1009,7 @@ static bool unified_findnearest(
 			ED_view3d_backbuf_validate(vc);
 			BMEdge *eed_zbuf = NULL;
 			BMEdge *eed_test = EDBM_edge_find_nearest_ex(vc, &dist, dist_center_p, true, use_cycle, &eed_zbuf);
-			if (hit.e.ele && dist_center_p) {
+			if (eed_test && dist_center_p) {
 				dist = min_ff(dist_margin, dist_center);
 			}
 			if (eed_test) {



More information about the Bf-blender-cvs mailing list