[Bf-blender-cvs] [70c2d8a1a2b] master: Fix T53469: Make sure that edges are drawn in the backbuff whenever you are looking for the nearest edge
Germano
noreply at git.blender.org
Tue Dec 5 14:14:06 CET 2017
Commit: 70c2d8a1a2b8b1e8c1f60f30451dbad88fba7188
Author: Germano
Date: Tue Dec 5 11:13:53 2017 -0200
Branches: master
https://developer.blender.org/rB70c2d8a1a2b8b1e8c1f60f30451dbad88fba7188
Fix T53469: Make sure that edges are drawn in the backbuff whenever you are looking for the nearest edge
Caused by rB9f5bf19
===================================================================
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 77a107534dd..1c620ad4681 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -634,9 +634,17 @@ BMEdge *EDBM_edge_find_nearest_ex(
unsigned int index;
BMEdge *eed;
+ /* Make sure that the edges are considered for selection.
+ * 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);
+ /* 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);
eed = index ? BM_edge_at_index_find_or_table(bm, index - 1) : NULL;
More information about the Bf-blender-cvs
mailing list