[Bf-blender-cvs] [6734bb1faf3] blender2.8: Merge branch 'master' into blender2.8

[Germano]

Commit: 6734bb1faf3a4c5c2446ecc4d2261f0d2ea9a39b
Author: Germano
Date:   Tue Dec 5 11:19:47 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB6734bb1faf3a4c5c2446ecc4d2261f0d2ea9a39b

Merge branch 'master' into blender2.8

# Conflicts:
#	source/blender/editors/mesh/editmesh_select.c

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



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

diff --cc source/blender/editors/mesh/editmesh_select.c
index a075ed657d1,1c620ad4681..3e0afd3095e
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@@ -640,10 -634,18 +640,18 @@@ BMEdge *EDBM_edge_find_nearest_ex
  		unsigned int index;
  		BMEdge *eed;
  
 -		/* Make sure that the edges are considered for selection.
++		/* Make sure that the edges also are considered to find nearest.
+ 		 * TODO: cleanup: add `selectmode` as a parameter */
+ 		const short ts_selectmode = vc->scene->toolsettings->selectmode;
+ 		vc->scene->toolsettings->selectmode |= SCE_SELECT_EDGE;
+ 
  		/* No afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad. */
 -		ED_view3d_backbuf_validate(vc);
 +		ED_view3d_backbuf_validate(eval_ctx, vc);
  
+ 		/* restore `selectmode` */
+ 		vc->scene->toolsettings->selectmode = ts_selectmode;
+ 
 -		index = ED_view3d_backbuf_sample_rect(vc, vc->mval, dist_px, bm_solidoffs, bm_wireoffs, &dist_test);
 +		index = ED_view3d_backbuf_sample_rect(eval_ctx, vc, vc->mval, dist_px, bm_solidoffs, bm_wireoffs, &dist_test);
  		eed = index ? BM_edge_at_index_find_or_table(bm, index - 1) : NULL;
  
  		if (r_eed_zbuf) {