==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.

5 files changed, 26 insertions, 17 deletions

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 153446caec5..da90c8e156c 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -175,6 +175,7 @@ typedef struct Global {
 #define G_DRAWCREASES	(1 << 19)
 #define G_DRAWSEAMS     (1 << 20)
 #define G_HIDDENEDGES   (1 << 21)
+#define G_HIDDENHANDLES (1 << 22) /* used for curves only */
 
 
 /* Measurement info Drawing */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 1d2ff1d0bf2..bab373c2424 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -427,7 +427,7 @@ typedef struct Scene {
 	
 	/* editmode stuff */
 	float editbutsize;                      /* size of normals */
-	short selectmode;
+	short selectmode;						/* for mesh only! */
 	short proportional, prop_mode;
 	short automerge, pad5, pad6, pad7;
 	
@@ -603,8 +603,6 @@ typedef struct Scene {
 #define SCE_SELECT_EDGE		2
 #define SCE_SELECT_FACE		4
 
-#define SCE_SELECT_CU_HANDLES_HIDE 8 /* for curve, when flagged hide handles */ 
-
 /* sce->recalc (now in use by previewrender) */
 #define SCE_PRV_CHANGED		1
 
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 7d0a920a8d0..f4fc9b85ada 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -2950,7 +2950,7 @@ static void editing_panel_curve_tools1(Object *ob, Curve *cu)
 
 	uiBlockBeginAlign(block);
 	uiDefButF(block, NUM,	REDRAWVIEW3D, "NSize:",	400, 60, 150, 19, &G.scene->editbutsize, 0.001, 1.0, 10, 0, "Normal size for drawing");
-	uiDefButBitI(block, TOGN, SCE_SELECT_CU_HANDLES_HIDE, REDRAWVIEW3D, "Draw Handles", 	400, 40, 150, 19, &G.scene->selectmode, 0, 0, 0, 0, "Draw curve handles in 3D view");
+	uiDefButBitI(block, TOGN, G_HIDDENHANDLES, REDRAWVIEW3D, "Draw Handles", 	400, 40, 150, 19, &G.f, 0, 0, 0, 0, "Draw curve handles in 3D view");
 	uiBlockEndAlign(block);
 	
 	if(G.obedit) {
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 556126c7518..3cb42fd6b1b 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -1357,7 +1357,7 @@ void nurbs_foreachScreenVert(void (*func)(void *userData, Nurb *nu, BPoint *bp,
 				BezTriple *bezt = &nu->bezt[i];
 
 				if(bezt->hide==0) {
-					if (G.scene->selectmode & SCE_SELECT_CU_HANDLES_HIDE) {
+					if (G.f & G_HIDDENHANDLES) {
 						view3d_project_short_clip(curarea, bezt->vec[1], s, pmat, vmat);
 						func(userData, nu, NULL, bezt, 1, s[0], s[1]);
 					} else {
@@ -2966,7 +2966,7 @@ static void tekenhandlesN(Nurb *nu, short sel)
 	unsigned int *col;
 	int a;
 	
-	if(nu->hide || (G.scene->selectmode & SCE_SELECT_CU_HANDLES_HIDE)) return;
+	if(nu->hide || (G.f & G_HIDDENHANDLES)) return;
 	
 	glBegin(GL_LINES); 
 	
@@ -3033,7 +3033,7 @@ static void tekenvertsN(Nurb *nu, short sel)
 		a= nu->pntsu;
 		while(a--) {
 			if(bezt->hide==0) {
-				if (G.scene->selectmode & SCE_SELECT_CU_HANDLES_HIDE) {
+				if (G.f & G_HIDDENHANDLES) {
 					if((bezt->f2 & 1)==sel) bglVertex3fv(bezt->vec[1]);
 				} else {
 					if((bezt->f1 & 1)==sel) bglVertex3fv(bezt->vec[0]);
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);
+				}
 			}
 		}
 	}