[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60604] trunk/blender/source/blender: use booleans in BKE_nurb_handles_autocalc and BMO_op_vinitf

[Campbell Barton]

Revision: 60604
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60604
Author:   campbellbarton
Date:     2013-10-08 12:35:58 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
use booleans in BKE_nurb_handles_autocalc and BMO_op_vinitf

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/curve.c
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2013-10-08 12:03:49 UTC (rev 60603)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2013-10-08 12:35:58 UTC (rev 60604)
@@ -3176,7 +3176,7 @@
 	const float eps_sq = eps * eps;
 
 	BezTriple *bezt2, *bezt1, *bezt0;
-	int i, align, leftsmall, rightsmall;
+	int i;
 
 	if (nu == NULL || nu->bezt == NULL)
 		return;
@@ -3187,7 +3187,7 @@
 	i = nu->pntsu;
 
 	while (i--) {
-		align = leftsmall = rightsmall = 0;
+		bool align = false, leftsmall = false, rightsmall = false;
 
 		/* left handle: */
 		if (flag == 0 || (bezt1->f1 & flag) ) {
@@ -3195,12 +3195,12 @@
 			/* distance too short: vectorhandle */
 			if (len_squared_v3v3(bezt1->vec[1], bezt0->vec[1]) < eps_sq) {
 				bezt1->h1 = HD_VECT;
-				leftsmall = 1;
+				leftsmall = true;
 			}
 			else {
 				/* aligned handle? */
 				if (dist_to_line_v2(bezt1->vec[1], bezt1->vec[0], bezt1->vec[2]) < eps) {
-					align = 1;
+					align = true;
 					bezt1->h1 = HD_ALIGN;
 				}
 				/* or vector handle? */
@@ -3214,7 +3214,7 @@
 			/* distance too short: vectorhandle */
 			if (len_squared_v3v3(bezt1->vec[1], bezt2->vec[1]) < eps_sq) {
 				bezt1->h2 = HD_VECT;
-				rightsmall = 1;
+				rightsmall = true;
 			}
 			else {
 				/* aligned handle? */

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-10-08 12:03:49 UTC (rev 60603)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-10-08 12:35:58 UTC (rev 60604)
@@ -1639,9 +1639,9 @@
 //	BMOpDefine *def;
 	char *opname, *ofmt, *fmt;
 	char slot_name[64] = {0};
-	int i /*, n = strlen(fmt) */, stop /*, slot_code = -1 */, type, state;
+	int i, type;
+	bool noslot, state;
 	char htype;
-	int noslot = 0;
 
 
 	/* basic useful info to help find where bmop formatting strings fail */
@@ -1662,7 +1662,7 @@
 	i = strcspn(fmt, " ");
 
 	opname = fmt;
-	if (!opname[i]) noslot = 1;
+	noslot = (opname[i] == '\0');
 	opname[i] = '\0';
 
 	fmt += i + (noslot ? 0 : 1);
@@ -1679,7 +1679,7 @@
 //	def = bmo_opdefines[i];
 	
 	i = 0;
-	state = 1; /* 0: not inside slot_code name, 1: inside slot_code name */
+	state = true;  /* false: not inside slot_code name, true: inside slot_code name */
 
 	while (*fmt) {
 		if (state) {
@@ -1705,7 +1705,7 @@
 			
 			BLI_strncpy(slot_name, fmt, sizeof(slot_name));
 			
-			state = 0;
+			state = false;
 			fmt += i;
 		}
 		else {
@@ -1726,13 +1726,13 @@
 					else GOTO_ERROR("matrix size was not 3 or 4");
 
 					BMO_slot_mat_set(op, op->slots_in, slot_name, va_arg(vlist, void *), size);
-					state = 1;
+					state = true;
 					break;
 				}
 				case 'v':
 				{
 					BMO_slot_vec_set(op->slots_in, slot_name, va_arg(vlist, float *));
-					state = 1;
+					state = true;
 					break;
 				}
 				case 'e':  /* single vert/edge/face */
@@ -1742,7 +1742,7 @@
 
 					BMO_slot_buffer_from_single(op, slot, ele);
 
-					state = 1;
+					state = true;
 					break;
 				}
 				case 's':
@@ -1761,20 +1761,20 @@
 						BMO_slot_copy(op_other, slots_out, slot_name_other,
 						              op,       slots_in, slot_name);
 					}
-					state = 1;
+					state = true;
 					break;
 				}
 				case 'i':
 					BMO_slot_int_set(op->slots_in, slot_name, va_arg(vlist, int));
-					state = 1;
+					state = true;
 					break;
 				case 'b':
 					BMO_slot_bool_set(op->slots_in, slot_name, va_arg(vlist, int));
-					state = 1;
+					state = true;
 					break;
 				case 'p':
 					BMO_slot_ptr_set(op->slots_in, slot_name, va_arg(vlist, void *));
-					state = 1;
+					state = true;
 					break;
 				case 'f':
 				case 'F':
@@ -1787,15 +1787,16 @@
 						BMO_slot_float_set(op->slots_in, slot_name, va_arg(vlist, double));
 					}
 					else {
+						bool stop = false;
+
 						htype = 0;
-						stop = 0;
 						while (1) {
 							switch (NEXT_CHAR(fmt)) {
 								case 'f': htype |= BM_FACE; break;
 								case 'e': htype |= BM_EDGE; break;
 								case 'v': htype |= BM_VERT; break;
 								default:
-									stop = 1;
+									stop = true;
 									break;
 							}
 							if (stop) {
@@ -1822,7 +1823,7 @@
 						}
 					}
 
-					state = 1;
+					state = true;
 					break;
 				default:
 					fprintf(stderr,