diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-09-21 16:44:04 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-09-21 16:45:03 +0300 |
| commit | 37fea2c0f0bb57b91595784af57d89259e9301ba (patch) | |
| tree | d947392b26f4a3f23019a66e101ed6105f63eb7b /source/blender/editors/space_view3d/view3d_select.c | |
| parent | 3523958de9f129e260a8a31260ef9459a10cc3cc (diff) | |
Edit Mode: Merge Xray and "Limit selection to visible" options behaviour
We now treat Xray as being the mode where Limit selection to visible is off.
If Xray is OFF, Limit selection to visible is considered ON.
To allow 'see through wires' with solid shading (not Xray shading) we still
draw solid shading if Xray is ON with Xray Alpha set to 1.0.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index d32176ab20a..61e26d4b1ef 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -875,7 +875,7 @@ static void do_lasso_select_meshobject__doSelectVert(void *userData, MVert *mv, } static void do_lasso_select_paintvert(ViewContext *vc, const int mcords[][2], short moves, const eSelectOp sel_op) { - const bool use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0; + const bool use_zbuf = V3D_IS_ZBUF(vc->v3d); Object *ob = vc->obact; Mesh *me = ob->data; rcti rect; @@ -1896,7 +1896,7 @@ static void do_paintvert_box_select__doSelectVert(void *userData, MVert *mv, con static int do_paintvert_box_select( ViewContext *vc, rcti *rect, const eSelectOp sel_op) { - const bool use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0; + const bool use_zbuf = V3D_IS_ZBUF(vc->v3d); Mesh *me; MVert *mvert; struct ImBuf *ibuf; @@ -2606,7 +2606,7 @@ static bool ed_wpaint_vertex_select_pick( bool extend, bool deselect, bool toggle, Object *obact) { View3D *v3d = CTX_wm_view3d(C); - const bool use_zbuf = (v3d->flag & V3D_ZBUF_SELECT) != 0; + const bool use_zbuf = V3D_IS_ZBUF(v3d); Mesh *me = obact->data; /* already checked for NULL */ unsigned int index = 0; @@ -2877,7 +2877,7 @@ static void paint_vertsel_circle_select_doSelectVert(void *userData, MVert *mv, } static void paint_vertsel_circle_select(ViewContext *vc, const bool select, const int mval[2], float rad) { - const bool use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0; + const bool use_zbuf = V3D_IS_ZBUF(vc->v3d); Object *ob = vc->obact; Mesh *me = ob->data; bool bbsel; |