From 2cff9b4cb605047927fbb1c774fdafcfd2ab534e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 25 Sep 2018 18:50:57 +0200 Subject: Curves: Move draw options to overlays This commit add one regression: it is impossible to currently hide handles in the viewport. But this should be fixed in another commit. --- source/blender/editors/space_view3d/view3d_select.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_view3d/view3d_select.c') diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 61e26d4b1ef..59654c400ba 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -676,7 +676,7 @@ static void do_lasso_select_curve__doSelect( } } else { - if (cu->drawflag & CU_HIDE_HANDLES) { + if ((data->vc->v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) == 0) { /* can only be (beztindex == 0) here since handles are hidden */ const bool is_select = bezt->f2 & SELECT; const int sel_op_result = ED_select_op_action_deselected(data->sel_op, is_select, is_inside); @@ -1996,7 +1996,7 @@ static void do_nurbs_box_select__doSelect( } } else { - if (cu->drawflag & CU_HIDE_HANDLES) { + if ((data->vc->v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) == 0) { /* can only be (beztindex == 0) here since handles are hidden */ const bool is_select = bezt->f2 & SELECT; const int sel_op_result = ED_select_op_action_deselected(data->sel_op, is_select, is_inside); @@ -2920,7 +2920,7 @@ static void nurbscurve_circle_doSelect( bp->f1 = data->select ? (bp->f1 | SELECT) : (bp->f1 & ~SELECT); } else { - if (cu->drawflag & CU_HIDE_HANDLES) { + if ((data->vc->v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_CU_HANDLES) == 0) { /* can only be (beztindex == 0) here since handles are hidden */ bezt->f1 = bezt->f2 = bezt->f3 = data->select ? (bezt->f2 | SELECT) : (bezt->f2 & ~SELECT); } -- cgit v1.2.3