Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-09-25 19:50:57 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-09-25 23:51:54 +0300
commit2cff9b4cb605047927fbb1c774fdafcfd2ab534e (patch)
tree101d1efb5507a9dbde2934b04f081e77ed1e131b /source/blender/editors/space_view3d/view3d_select.c
parent05d0e5315b99f939687838b50519d0702b4c8fb4 (diff)
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.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c6
1 files changed, 3 insertions, 3 deletions
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);
}