From 5007d9557229a83cca7cba32f9162be73ea1dbdb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 25 Oct 2007 15:23:52 +0000 Subject: ==Curve Editing== Curve select lasso and border didnt work with hide handles enabled. Hiding handles was using the scene->selectmode variable, but looking at this now, I see there are places where selectmode is compared with SCE_SELECT_VERTEX, EDGE, FACE etc. as well as being. Better to use a global flag, same as G_DRAWFACES. This is not good since anyone using this in the few days will have an invalid selectmode variable. simple way to fix is to change modes, so do_versions shouldnt be needed. --- source/blender/src/editview.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'source/blender/src/editview.c') diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index 93649168e82..a11ef953c22 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -533,12 +533,17 @@ static void do_lasso_select_curve__doSelect(void *userData, Nurb *nu, BPoint *bp if (bp) { bp->f1 = data->select?(bp->f1|1):(bp->f1&~1); } else { - if (beztindex==0) { - bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1); - } else if (beztindex==1) { - bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1); + if (G.f & G_HIDDENHANDLES) { + /* can only be beztindex==0 here since handles are hidden */ + bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f1|1):(bezt->f1&~1); } else { - bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1); + if (beztindex==0) { + bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1); + } else if (beztindex==1) { + bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1); + } else { + bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1); + } } } } @@ -1602,12 +1607,17 @@ static void do_nurbs_box_select__doSelect(void *userData, Nurb *nu, BPoint *bp, if (bp) { bp->f1 = data->select?(bp->f1|1):(bp->f1&~1); } else { - if (beztindex==0) { - bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1); - } else if (beztindex==1) { - bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1); + if (G.f & G_HIDDENHANDLES) { + /* can only be beztindex==0 here since handles are hidden */ + bezt->f1 = bezt->f2 = bezt->f3 = data->select?(bezt->f1|1):(bezt->f1&~1); } else { - bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1); + if (beztindex==0) { + bezt->f1 = data->select?(bezt->f1|1):(bezt->f1&~1); + } else if (beztindex==1) { + bezt->f2 = data->select?(bezt->f2|1):(bezt->f2&~1); + } else { + bezt->f3 = data->select?(bezt->f3|1):(bezt->f3&~1); + } } } } -- cgit v1.2.3