For the 100st time or so: fix in selecting vertices for Mesh editmode.

Why do i keep thinking it works? And will it be still broken? We find
out in a month! :)

Fixes also report 1191.

2 files changed, 36 insertions, 36 deletions

diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c
index dda1837235e..d30f13966ea 100644
--- a/source/blender/src/edit.c
+++ b/source/blender/src/edit.c
@@ -595,45 +595,45 @@ void countall()
 					bezt= nu->bezt;
 					a= nu->pntsu;
 					while(a--) {
-					G.totvert+=3;
-					if(bezt->f1) G.totvertsel++;
-					if(bezt->f2) G.totvertsel++;
-					if(bezt->f3) G.totvertsel++;
-					bezt++;
+						G.totvert+=3;
+						if(bezt->f1) G.totvertsel++;
+						if(bezt->f2) G.totvertsel++;
+						if(bezt->f3) G.totvertsel++;
+						bezt++;
+					}
 				}
-			}
-			else {
-				bp= nu->bp;
-				a= nu->pntsu*nu->pntsv;
-				while(a--) {
-					G.totvert++;
-					if(bp->f1 & 1) G.totvertsel++;
-					bp++;
+				else {
+					bp= nu->bp;
+					a= nu->pntsu*nu->pntsv;
+					while(a--) {
+						G.totvert++;
+						if(bp->f1 & 1) G.totvertsel++;
+						bp++;
+					}
 				}
+				nu= nu->next;
 			}
-			nu= nu->next;
 		}
-	}
-	else if(G.obedit->type==OB_MBALL) {
-		ml= editelems.first;
-		while(ml) {
-			G.totvert++;
-			if(ml->flag & SELECT) G.totvertsel++;
-			ml= ml->next;
+		else if(G.obedit->type==OB_MBALL) {
+			ml= editelems.first;
+			while(ml) {
+				G.totvert++;
+				if(ml->flag & SELECT) G.totvertsel++;
+				ml= ml->next;
+			}
 		}
-	}
-	else if(G.obedit->type==OB_LATTICE) {
-		bp= editLatt->def;
-		
-		a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
-		while(a--) {
-			G.totvert++;
-			if(bp->f1 & 1) G.totvertsel++;
-			bp++;
+		else if(G.obedit->type==OB_LATTICE) {
+			bp= editLatt->def;
+			
+			a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
+			while(a--) {
+				G.totvert++;
+				if(bp->f1 & 1) G.totvertsel++;
+				bp++;
+			}
 		}
-	}
-	
-	allqueue(REDRAWINFO, 1);	/* 1, because header->win==0! */
+		
+		allqueue(REDRAWINFO, 1);	/* 1, because header->win==0! */
 		return;
 	}
 	else if(G.f & (G_FACESELECT + G_VERTEXPAINT + G_TEXTUREPAINT +G_WEIGHTPAINT)) {
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c
index 3fce50bd9d2..8c403571eac 100644
--- a/source/blender/src/editmesh.c
+++ b/source/blender/src/editmesh.c
@@ -3269,7 +3269,7 @@ static void draw_vertices_special(int mode, EditVert *act) /* teken = draw */
 {
 	/* (only this view, no other windows) */
 	/* hackish routine for visual speed:
-	 * mode 0: deselect the selected ones, draw then, except act
+	 * mode 0: deselect the selected ones, draw them, except act
 	 * mode 1: only draw act
 	 */
 	EditMesh *em = G.editMesh;
@@ -3284,7 +3284,7 @@ static void draw_vertices_special(int mode, EditVert *act) /* teken = draw */
 	mymultmatrix(G.obedit->obmat);
 
 	if(mode==0) {
-		BIF_GetThemeColor3ubv(TH_VERTEX, col);
+		BIF_ThemeColor(TH_VERTEX);
 		
 		/* set zbuffer on, its default off outside main drawloops */
 		if(G.vd->drawtype > OB_WIRE) {
@@ -3298,7 +3298,7 @@ static void draw_vertices_special(int mode, EditVert *act) /* teken = draw */
 			if(eve->h==0) {
 				if(eve!=act && (eve->f & 1)) {
 					eve->f -= 1;
-					glVertex3fv(act->co);
+					glVertex3fv(eve->co);
 				}
 			}
 			eve= eve->next;