display real fps in 3d view option

replace 1 with SELECT
edited DVar texture tooltip

1 files changed, 45 insertions, 48 deletions

diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c
index 25110a971e4..8d845c4ba14 100644
--- a/source/blender/src/editcurve.c
+++ b/source/blender/src/editcurve.c
@@ -207,7 +207,7 @@ int isNurbsel_count(Nurb *nu)
 		bezt= nu->bezt;
 		a= nu->pntsu;
 		while(a--) {
-			if( (bezt->f1 & SELECT) || (bezt->f2 & SELECT) || (bezt->f3 & SELECT) ) sel++;
+			if (BEZSELECTED_HIDDENHANDLES(bezt)) sel++;
 			bezt++;
 		}
 	}
@@ -1341,9 +1341,9 @@ static void select_adjacent_cp(short next, short cont, short selstatus)
 			while(a--) {
 				if(a-abs(next) < 0) break;
 				sel=0;
-				if((lastsel==0) && (bp->hide==0) && ((bp->f1 & 1) || (selstatus==0))) {
+				if((lastsel==0) && (bp->hide==0) && ((bp->f1 & SELECT) || (selstatus==0))) {
 					bp+=next;
-					if(!(bp->f1 & 1) || (selstatus==0)) {
+					if(!(bp->f1 & SELECT) || (selstatus==0)) {
 						sel= select_bpoint(bp, selstatus, 1, VISIBLE);
 						if((sel==1) && (cont==0)) lastsel= 1;
 					}			
@@ -1442,11 +1442,11 @@ void hideNurb(int swap)
 			a= nu->pntsu*nu->pntsv;
 			sel= 0;
 			while(a--) {
-				if(swap==0 && (bp->f1 & 1)) {
+				if(swap==0 && (bp->f1 & SELECT)) {
 					select_bpoint(bp, DESELECT, 1, HIDDEN);
 					bp->hide= 1;
 				}
-				else if(swap && (bp->f1 & 1)==0) {
+				else if(swap && (bp->f1 & SELECT)==0) {
 					select_bpoint(bp, DESELECT, 1, HIDDEN);
 					bp->hide= 1;
 				}
@@ -1666,7 +1666,7 @@ void subdivideNurb()
 				bp= prevbp+1;
 			}
 			while(a--) {
-				if( (bp->f1 & 1) && (prevbp->f1 & 1) ) amount++;
+				if( (bp->f1 & SELECT) && (prevbp->f1 & SELECT) ) amount++;
 				prevbp= bp;
 				bp++;
 			}
@@ -1691,7 +1691,7 @@ void subdivideNurb()
 					memcpy(bpn, prevbp, sizeof(BPoint));
 					bpn++;
 
-					if( (bp->f1 & 1) && (prevbp->f1 & 1) ) {
+					if( (bp->f1 & SELECT) && (prevbp->f1 & SELECT) ) {
                  // printf("*** subdivideNurb: insert 'linear' point\n");
 						memcpy(bpn, bp, sizeof(BPoint));
 						bpn->vec[0]= (prevbp->vec[0]+bp->vec[0])/2.0;
@@ -1767,7 +1767,7 @@ void subdivideNurb()
 			bp= nu->bp;
 			for(a=0; a<nu->pntsv; a++) {
 				for(b=0; b<nu->pntsu; b++) {
-					if(bp->f1 & 1) {
+					if(bp->f1 & SELECT) {
 						usel[b]++;
 						vsel[a]++;
 						sel++;
@@ -2237,7 +2237,7 @@ int is_u_selected(Nurb *nu, int u)
 	/* what about resolu == 2? */
 	bp= nu->bp+u;
 	for(v=0; v<nu->pntsv-1; v++, bp+=nu->pntsu) {
-		if(v) if(bp->f1 & 1) return 1;
+		if(v) if(bp->f1 & SELECT) return 1;
 	}
 	
 	return 0;
@@ -2516,7 +2516,7 @@ void addsegment_nurb()
 			if(isNurbsel_count(nu)==1) {
 				/* only 1 selected, not first or last, a little complex, but intuitive */
 				if(nu->pntsv==1) {
-					if( (nu->bp->f1 & 1) || ((nu->bp+nu->pntsu-1)->f1 & 1));
+					if( (nu->bp->f1 & SELECT) || ((nu->bp+nu->pntsu-1)->f1 & SELECT));
 					else break;
 				}
 			}
@@ -2560,23 +2560,23 @@ void addsegment_nurb()
 			else if(nu->pntsv==1) {
 				bp= nu->bp;
 				if(nu1==0) {
-					if( bp->f1 & 1) nu1= nu;
+					if( bp->f1 & SELECT) nu1= nu;
 					else {
 						bp= bp+(nu->pntsu-1);
-						if( bp->f1 & 1 ) {
+						if( bp->f1 & SELECT ) {
 							nu1= nu;
 							switchdirectionNurb(nu);
 						}
 					}
 				}
 				else if(nu2==0) {
-					if( bp->f1 & 1) {
+					if( bp->f1 & SELECT ) {
 						nu2= nu;
 						switchdirectionNurb(nu);
 					}
 					else {
 						bp= bp+(nu->pntsu-1);
-						if( bp->f1 & 1 ) {
+						if( bp->f1 & SELECT ) {
 							nu2= nu;
 						}
 					}
@@ -2669,8 +2669,8 @@ void mouse_nurb()
 			if(bezt) {
 
 				if(hand==1) select_beztriple(bezt, SELECT, 1, HIDDEN);
-				else if(hand==0) bezt->f1|= 1;
-				else bezt->f3|= 1;
+				else if(hand==0) bezt->f1|= SELECT;
+				else bezt->f3|= SELECT;
 			}
 			else {
 				lastselbp= bp;
@@ -2978,10 +2978,7 @@ void extrude_nurb()
 		}
 		if(nu) {
 			addvert_Nurb('e');
-		}
-		else {
-
-
+		} else {
 			ok= extrudeflagNurb(1); /* '1'= flag */
 		
 			if(ok) {
@@ -3011,7 +3008,7 @@ void makecyclicNurb()
 				a= nu->pntsu;
 				bp= nu->bp;
 				while(a--) {
-					if( bp->f1 & 1 ) {
+					if( bp->f1 & SELECT ) {
 						if(nu->flagu & CU_CYCLIC) nu->flagu--;
 						else nu->flagu++;
 						break;
@@ -3036,7 +3033,7 @@ void makecyclicNurb()
 				a= nu->pntsu;
 				bp= nu->bp;
 				while(a--) {
-					if( bp->f1 & 1 ) {
+					if( bp->f1 & SELECT ) {
 						if(nu->flagu & CU_CYCLIC) nu->flagu--;
 						else {
 							nu->flagu++;
@@ -3064,7 +3061,7 @@ void makecyclicNurb()
 				bp= nu->bp;
 				while(a--) {
 	
-					if( bp->f1 & 1) {
+					if( bp->f1 & SELECT) {
 						if(cyclmode==1 && nu->pntsu>1) {
 							if(nu->flagu & CU_CYCLIC) nu->flagu--;
 							else {
@@ -3154,7 +3151,7 @@ void selectrow_nurb()
 		for(v=0; v<nu->pntsv; v++) {
 			for(u=0; u<nu->pntsu; u++, bp++) {
 				if(bp==lastselbp) {
-					if(bp->f1 & 1) {
+					if(bp->f1 & SELECT) {
 						ok= 1;
 						break;
 					}
@@ -3292,18 +3289,18 @@ void select_more_nurb()
 			bp= nu->bp;
 			selbpoints= MEM_callocN(sizeof(short)*a-nu->pntsu, "selectlist");
 			while(a > 0) {
-				if((selbpoints[a]!=1) && (bp->hide==0) && (bp->f1 & 1)) {
+				if((selbpoints[a]!=1) && (bp->hide==0) && (bp->f1 & SELECT)) {
 					/* upper control point */
 					if(a%nu->pntsu != 0) {
 						tempbp= bp-1;
-						if(!(tempbp->f1 & 1)) select_bpoint(tempbp, SELECT, 1, VISIBLE); 
+						if(!(tempbp->f1 & SELECT)) select_bpoint(tempbp, SELECT, 1, VISIBLE); 
 					}
 
 					/* left control point. select only if it is not selected already */
 					if(a-nu->pntsu > 0) {
 						sel= 0;
 						tempbp= bp+nu->pntsu;
-						if(!(tempbp->f1 & 1)) sel= select_bpoint(tempbp, SELECT, 1, VISIBLE); 
+						if(!(tempbp->f1 & SELECT)) sel= select_bpoint(tempbp, SELECT, 1, VISIBLE); 
 						/* make sure selected bpoint is discarded */
 						if(sel == 1) selbpoints[a-nu->pntsu]= 1;
 					}
@@ -3311,7 +3308,7 @@ void select_more_nurb()
 					/* right control point */
 					if(a+nu->pntsu < nu->pntsu*nu->pntsv) {
 						tempbp= bp-nu->pntsu;
-						if(!(tempbp->f1 & 1)) select_bpoint(tempbp, SELECT, 1, VISIBLE); 
+						if(!(tempbp->f1 & SELECT)) select_bpoint(tempbp, SELECT, 1, VISIBLE); 
 					}
 				
 					/* lower control point. skip next bp in case selection was made */
@@ -3361,7 +3358,7 @@ void select_less_nurb()
 			bp= nu->bp;
 			selbpoints= MEM_callocN(sizeof(short)*a, "selectlist");
 			while(a--) {
-				if((bp->hide==0) && (bp->f1 & 1)) {
+				if((bp->hide==0) && (bp->f1 & SELECT)) {
 					sel= 0;
 									
 					/* check if neighbours have been selected */	
@@ -3369,28 +3366,28 @@ void select_less_nurb()
 					if((a+1)%nu->pntsu==0) sel++;	
 					else {
 						bp--;
-						if((selbpoints[a+1]==1) || ((bp->hide==0) && (bp->f1 & 1))) sel++;
+						if((selbpoints[a+1]==1) || ((bp->hide==0) && (bp->f1 & SELECT))) sel++;
 						bp++;
 					}
 					
 					if((a+1)%nu->pntsu==1) sel++;
 					else {
 						bp++;
-						if((bp->hide==0) && (bp->f1 & 1)) sel++;
+						if((bp->hide==0) && (bp->f1 & SELECT)) sel++;
 						bp--;
 					}
 					
 					if(a+1 > nu->pntsu*nu->pntsv-nu->pntsu) sel++;
 					else {
 						bp-=nu->pntsu;
-						if((selbpoints[a+nu->pntsu]==1) || ((bp->hide==0) && (bp->f1 & 1))) sel++;
+						if((selbpoints[a+nu->pntsu]==1) || ((bp->hide==0) && (bp->f1 & SELECT))) sel++;
 						bp+=nu->pntsu;
 					}
 									
 					if(a < nu->pntsu) sel++;
 					else {
 						bp+=nu->pntsu;
-						if((bp->hide==0) && (bp->f1 & 1)) sel++;
+						if((bp->hide==0) && (bp->f1 & SELECT)) sel++;
 						bp-=nu->pntsu;
 					}
 													
@@ -3450,7 +3447,7 @@ void select_less_nurb()
 				a= nu->pntsu*nu->pntsv;
 				bp= nu->bp;
 				while(a--) {
-					if((lastsel==0) && (bp->hide==0) && (bp->f1 & 1)) {
+					if((lastsel==0) && (bp->hide==0) && (bp->f1 & SELECT)) {
 						if(lastsel!=0) sel= 1;
 						else sel= 0;
 						
@@ -3458,14 +3455,14 @@ void select_less_nurb()
 						if(a==nu->pntsu*nu->pntsv-1) sel++; 
 						else { 
 							bp--;
-							if((bp->hide==0) && (bp->f1 & 1)) sel++;
+							if((bp->hide==0) && (bp->f1 & SELECT)) sel++;
 							bp++;
 						}
 						
 						if(a==0) sel++;
 						else {
 							bp++;
-							if((bp->hide==0) && (bp->f1 & 1)) sel++;
+							if((bp->hide==0) && (bp->f1 & SELECT)) sel++;
 							bp--;
 						}
 											
@@ -3653,7 +3650,7 @@ void delNurb()
 				a= nu->pntsu*nu->pntsv;
 				if(a) {
 					while(a) {
-						if(bp->f1 & 1 );
+						if(bp->f1 & SELECT);
 						else break;
 						a--;
 						bp++;
@@ -3695,7 +3692,7 @@ void delNurb()
 				bp= nu->bp;
 				
 				for(a=0;a<nu->pntsu;a++) {
-					if( bp->f1 & 1 ) {
+					if( bp->f1 & SELECT ) {
 						memcpy(bp, bp+1, (nu->pntsu-a-1)*sizeof(BPoint));
 						nu->pntsu--;
 						a--;
@@ -3754,7 +3751,7 @@ void delNurb()
 			else if(nu->pntsv==1) {
 				bp= nu->bp;
 				for(a=0; a<nu->pntsu-1; a++) {
-					if( bp->f1 & 1 ) {
+					if( bp->f1 & SELECT ) {
 						bp1= bp;
 						bp2= bp+1;
 						if( bp2->f1 & 1 ) ;
@@ -4080,7 +4077,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 			for(a=0;a<4;a++, bp++) {
 				VECCOPY(bp->vec, cent);
 				bp->vec[3]= 1.0;
-				bp->f1= 1;
+				bp->f1= SELECT;
 				bp->radius = bp->weight = 1.0;
 			}
 
@@ -4117,7 +4114,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 		for(a=0;a<5;a++, bp++) {
 			VECCOPY(bp->vec, cent);
 			bp->vec[3]= 1.0;
-			bp->f1= 1;
+			bp->f1= SELECT;
 			bp->radius = bp->weight = 1.0;
 		}
 
@@ -4200,7 +4197,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 			bp= nu->bp;
 
 			for(a=0; a<8; a++) {
-				bp->f1= 1;
+				bp->f1= SELECT;
 				VECCOPY(bp->vec, cent);
 
 				if(xzproj==0) {
@@ -4242,7 +4239,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 			for(a=0; a<4; a++) {
 				for(b=0; b<4; b++) {
 					VECCOPY(bp->vec, cent);
-					bp->f1= 1;
+					bp->f1= SELECT;
 					fac= (float)a -1.5;
 					bp->vec[0]+= fac*grid;
 					fac= (float)b -1.5;
@@ -4286,7 +4283,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 			a= nu->pntsu*nu->pntsv;
 			bp= nu->bp;
 			while(a-- >0) {
-				bp->f1 |= 1;
+				bp->f1 |= SELECT;
 				bp++;
 			}
 		}
@@ -4309,7 +4306,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 			bp= nu->bp;
 
 			for(a=0; a<5; a++) {
-				bp->f1= 1;
+				bp->f1= SELECT;
 				VECCOPY(bp->vec, cent);
 				bp->vec[0]+= nurbcircle[a][0]*grid;
 				bp->vec[2]+= nurbcircle[a][1]*grid;
@@ -4330,7 +4327,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 			a= nu->pntsu*nu->pntsv;
 			bp= nu->bp;
 			while(a-- >0) {
-				bp->f1 |= 1;
+				bp->f1 |= SELECT;
 				bp++;
 			}
 			BLI_remlink(&editNurb, nu);
@@ -4358,7 +4355,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 			a= nu->pntsu*nu->pntsv;
 			bp= nu->bp;
 			while(a-- >0) {
-				bp->f1 |= 1;
+				bp->f1 |= SELECT;
 				bp++;
 			}
 
@@ -4541,7 +4538,7 @@ void clear_tilt()
 			bp= nu->bp;
 			a= nu->pntsu*nu->pntsv;
 			while(a--) {
-				if(bp->f1 & 1) bp->alfa= 0.0;
+				if(bp->f1 & SELECT) bp->alfa= 0.0;
 				bp++;
 			}
 		}