diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
| commit | 95011f6d484b369db92ae13c674a6522d664ea8f (patch) | |
| tree | 91ba2719c9f3096fad0f1f768aa7b1c4d79aa32a /source/blender/editors/mesh/editmesh_select.c | |
| parent | 0911acb5cf49c5ba05b1df045b41697704aa288a (diff) | |
| parent | 44505b38df557a5711703613685a1dec9fc2c3d9 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/editmesh_select.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index fd8efcd84e3..634c65485e9 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -678,10 +678,10 @@ BMEdge *EDBM_edge_find_nearest_ex( { FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, SCE_SELECT_EDGE); ED_view3d_backbuf_validate_with_select_mode(vc, select_mode); - + index = ED_view3d_backbuf_sample_rect(vc, vc->mval, dist_px, bm_solidoffs, bm_wireoffs, &dist_test); eed = index ? BM_edge_at_index_find_or_table(bm, index - 1) : NULL; - + FAKE_SELECT_MODE_END(vc, fake_select_mode); } @@ -1061,7 +1061,7 @@ static bool unified_findnearest( mval_prev[0] = vc->mval[0]; mval_prev[1] = vc->mval[1]; - + /* Only one element type will be non-null. */ BLI_assert(((hit.v.ele != NULL) + (hit.e.ele != NULL) + (hit.f.ele != NULL)) <= 1); |