code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.

22 files changed, 111 insertions, 104 deletions

diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index ed6eceb036b..6198a119ac4 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -751,14 +751,14 @@ static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, i
 			dob = new_dupli_object(lb, go->ob, mat, ob->lay, 0, OB_DUPLIGROUP, animated);
 
 			/* check the group instance and object layers match, also that the object visible flags are ok. */
-			if (    (dob->origlay & group->layer) == 0 ||
-			        (G.rendering == 0 && dob->ob->restrictflag & OB_RESTRICT_VIEW) ||
-			        (G.rendering && dob->ob->restrictflag & OB_RESTRICT_RENDER)
-			        ) {
-				dob->no_draw = 1;
+			if ((dob->origlay & group->layer) == 0 ||
+			    (G.rendering == 0 && dob->ob->restrictflag & OB_RESTRICT_VIEW) ||
+			    (G.rendering && dob->ob->restrictflag & OB_RESTRICT_RENDER))
+			{
+				dob->no_draw = TRUE;
 			}
 			else {
-				dob->no_draw = 0;
+				dob->no_draw = FALSE;
 			}
 
 			if (go->ob->transflag & OB_DUPLI) {
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index fe95d15f82e..752036c6b9f 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -437,7 +437,7 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 	float h1[3], h2[3], scale[3], length, hlength1, hlength2, roll1 = 0.0f, roll2;
 	float mat3[3][3], imat[4][4], posemat[4][4], scalemat[4][4], iscalemat[4][4];
 	float data[MAX_BBONE_SUBDIV + 1][4], *fp;
-	int a, doscale = 0;
+	int a, do_scale = 0;
 
 	length = bone->length;
 
@@ -455,7 +455,7 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 			invert_m4_m4(iscalemat, scalemat);
 
 			length *= scale[1];
-			doscale = 1;
+			do_scale = 1;
 		}
 	}
 
@@ -476,7 +476,7 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 	if (rest) {
 		invert_m4_m4(imat, pchan->bone->arm_mat);
 	}
-	else if (doscale) {
+	else if (do_scale) {
 		copy_m4_m4(posemat, pchan->pose_mat);
 		normalize_m4(posemat);
 		invert_m4_m4(imat, posemat);
@@ -581,7 +581,7 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
 		copy_m4_m3(result_array[a].mat, mat3);
 		copy_v3_v3(result_array[a].mat[3], fp);
 
-		if (doscale) {
+		if (do_scale) {
 			/* correct for scaling when this matrix is used in scaled space */
 			mul_serie_m4(result_array[a].mat, iscalemat, result_array[a].mat, scalemat, NULL, NULL, NULL, NULL, NULL);
 		}
@@ -835,7 +835,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
 	const short invert_vgroup = deformflag & ARM_DEF_INVERT_VGROUP;
 	int defbase_tot = 0;       /* safety for vertexgroup index overflow */
 	int i, target_totvert = 0; /* safety for vertexgroup overflow */
-	int use_dverts = 0;
+	int use_dverts = FALSE;
 	int armature_def_nr;
 	int totchan;
 
@@ -895,11 +895,12 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
 	if (deformflag & ARM_DEF_VGROUP) {
 		if (ELEM(target->type, OB_MESH, OB_LATTICE)) {
 			/* if we have a DerivedMesh, only use dverts if it has them */
-			if (dm)
-				if (dm->getVertData(dm, 0, CD_MDEFORMVERT))
-					use_dverts = 1;
-				else use_dverts = 0;
-			else if (dverts) use_dverts = 1;
+			if (dm) {
+				use_dverts = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);
+			}
+			else if (dverts) {
+				use_dverts = TRUE;
+			}
 
 			if (use_dverts) {
 				defnrToPC = MEM_callocN(sizeof(*defnrToPC) * defbase_tot, "defnrToBone");
@@ -2245,13 +2246,13 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha
 	int do_modif;
 
 	for (strip = armob->nlastrips.first; strip; strip = strip->next) {
-		do_modif = 0;
+		do_modif = FALSE;
 
 		if (scene_cfra >= strip->start && scene_cfra <= strip->end)
-			do_modif = 1;
+			do_modif = TRUE;
 
 		if ((scene_cfra > strip->end) && (strip->flag & ACTSTRIP_HOLDLASTFRAME)) {
-			do_modif = 1;
+			do_modif = TRUE;
 
 			/* if there are any other strips active, ignore modifiers for this strip -
 			 * 'hold' option should only hold action modifiers if there are
@@ -2261,7 +2262,7 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha
 
 				if (scene_cfra >= strip2->start && scene_cfra <= strip2->end) {
 					if (!(strip2->flag & ACTSTRIP_MUTE))
-						do_modif = 0;
+						do_modif = FALSE;
 				}
 			}
 
@@ -2270,7 +2271,7 @@ static void do_strip_modifiers(Scene *scene, Object *armob, Bone *bone, bPoseCha
 			for (strip2 = strip->next; strip2; strip2 = strip2->next) {
 				if (scene_cfra < strip2->start) continue;
 				if ((strip2->flag & ACTSTRIP_HOLDLASTFRAME) && !(strip2->flag & ACTSTRIP_MUTE)) {
-					do_modif = 0;
+					do_modif = FALSE;
 				}
 			}
 		}
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 3450408a0a0..cc49652d6e5 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1039,13 +1039,13 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 	MFace *mface = cddm->mface;
 	/* MTFace *tf = dm->getTessFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */
 	float (*nors)[3] = dm->getTessFaceDataArray(dm, CD_NORMAL);
-	int a, b, dodraw, matnr, new_matnr;
+	int a, b, do_draw, matnr, new_matnr;
 	int orig, *index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
 
 	cdDM_update_normals_from_pbvh(dm);
 
 	matnr = -1;
-	dodraw = 0;
+	do_draw = FALSE;
 
 	glShadeModel(GL_SMOOTH);
 
@@ -1062,14 +1062,14 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 			if (new_matnr != matnr) {
 				glEnd();
 
-				dodraw = setMaterial(matnr = new_matnr, &gattribs);
-				if (dodraw)
+				do_draw = setMaterial(matnr = new_matnr, &gattribs);
+				if (do_draw)
 					DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
 
 				glBegin(GL_QUADS);
 			}
 
-			if (!dodraw) {
+			if (!do_draw) {
 				continue;
 			}
 			else if (setDrawOptions) {
@@ -1139,7 +1139,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 					numfaces = curface - start;
 					if (numfaces > 0) {
 
-						if (dodraw) {
+						if (do_draw) {
 
 							if (numdata != 0) {
 
@@ -1161,9 +1161,9 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 					}
 					numdata = 0;
 					start = curface;
-					/* prevdraw = dodraw; */ /* UNUSED */
-					dodraw = setMaterial(matnr = new_matnr, &gattribs);
-					if (dodraw) {
+					/* prevdraw = do_draw; */ /* UNUSED */
+					do_draw = setMaterial(matnr = new_matnr, &gattribs);
+					if (do_draw) {
 						DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
 
 						if (attribs.totorco) {
@@ -1215,7 +1215,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 					}
 				}
 
-				if (dodraw && numdata != 0) {
+				if (do_draw && numdata != 0) {
 					offset = 0;
 					if (attribs.totorco) {
 						copy_v3_v3((float *)&varray[elementsize * curface * 3], (float *)attribs.orco.array[mface->v1]);
@@ -1257,7 +1257,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 				}
 				curface++;
 				if (mface->v4) {
-					if (dodraw && numdata != 0) {
+					if (do_draw && numdata != 0) {
 						offset = 0;
 						if (attribs.totorco) {
 							copy_v3_v3((float *)&varray[elementsize * curface * 3], (float *)attribs.orco.array[mface->v3]);
@@ -1302,7 +1302,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 			}
 			numfaces = curface - start;
 			if (numfaces > 0) {
-				if (dodraw) {
+				if (do_draw) {
 					if (numdata != 0) {
 						GPU_buffer_unlock(buffer);
 						GPU_interleaved_attrib_setup(buffer, datatypes, numdata);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index d736309f605..4cdb4e1b66e 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -44,6 +44,7 @@
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_main.h"
@@ -251,7 +252,7 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
 	bScreen *sc;
 	ScrArea *sa;
 	ARegion *ar;
-	int done = 0, recursion = C->data.recursion;
+	int done = FALSE, recursion = C->data.recursion;
 	int ret = 0;
 
 	memset(result, 0, sizeof(bContextDataResult));
@@ -279,7 +280,7 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
 		entry = BLI_rfindstring(&C->wm.store->entries, member, offsetof(bContextStoreEntry, name));
 		if (entry) {
 			result->ptr = entry->ptr;
-			done = 1;
+			done = TRUE;
 		}
 	}
 	if (done != 1 && recursion < 2 && (ar = CTX_wm_region(C))) {
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 6a0991cf4e5..ce62b9c10dc 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -378,7 +378,7 @@ void BKE_curve_texspace_calc(Curve *cu)
 	DispList *dl;
 	BoundBox *bb;
 	float *fp, min[3], max[3];
-	int tot, doit = 0;
+	int tot, do_it = FALSE;
 
 	if (cu->bb == NULL)
 		cu->bb = MEM_callocN(sizeof(BoundBox), "boundbox");
@@ -390,7 +390,7 @@ void BKE_curve_texspace_calc(Curve *cu)
 	while (dl) {
 		tot = ELEM(dl->type, DL_INDEX3, DL_INDEX4) ? dl->nr : dl->nr * dl->parts;
 
-		if (tot) doit = 1;
+		if (tot) do_it = TRUE;
 		fp = dl->verts;
 		while (tot--) {
 			minmax_v3v3_v3(min, max, fp);
@@ -399,7 +399,7 @@ void BKE_curve_texspace_calc(Curve *cu)
 		dl = dl->next;
 	}
 
-	if (!doit) {
+	if (do_it == FALSE) {
 		min[0] = min[1] = min[2] = -1.0f;
 		max[0] = max[1] = max[2] = 1.0f;
 	}
@@ -1272,12 +1272,12 @@ float *BKE_curve_surf_make_orco(Object *ob)
 				for (b = 0; b < sizeu; b++) {
 					int use_b = b;
 					if (b == sizeu - 1 && (nu->flagu & CU_NURB_CYCLIC))
-						use_b = 0;
+						use_b = FALSE;
 
 					for (a = 0; a < sizev; a++) {
 						int use_a = a;
 						if (a == sizev - 1 && (nu->flagv & CU_NURB_CYCLIC))
-							use_a = 0;
+							use_a = FALSE;
 
 						tdata = _tdata + 3 * (use_b * (nu->pntsv * resolv) + use_a);
 
@@ -2216,7 +2216,7 @@ void BKE_curve_bevelList_make(Object *ob)
 		/* check if we will calculate tilt data */
 		do_tilt = CU_DO_TILT(cu, nu);
 		do_radius = CU_DO_RADIUS(cu, nu); /* normal display uses the radius, better just to calculate them */
-		do_weight = 1;
+		do_weight = TRUE;
 
 		/* check we are a single point? also check we are not a surface and that the orderu is sane,
 		 * enforced in the UI but can go wrong possibly */
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index e44264c8d4b..2b08c085417 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2631,7 +2631,7 @@ void DAG_ids_flush_tagged(Main *bmain)
 	ListBase *lbarray[MAX_LIBARRAY];
 	Scene *sce;
 	unsigned int lay;
-	int a, do_flush = 0;
+	int a, do_flush = FALSE;
 
 	dag_current_scene_layers(bmain, &sce, &lay);
 
@@ -2651,7 +2651,7 @@ void DAG_ids_flush_tagged(Main *bmain)
 			for (; id; id = id->next) {
 				if (id->flag & (LIB_ID_RECALC | LIB_ID_RECALC_DATA)) {
 					dag_id_flush_update(sce, id);
-					do_flush = 1;
+					do_flush = TRUE;
 				}
 			}
 		}
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index b3ed3dcaf1d..d526ce7afdc 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -276,12 +276,12 @@ DynamicPaintSurface *get_activeSurface(DynamicPaintCanvasSettings *canvas)
 void dynamicPaint_resetPreview(DynamicPaintCanvasSettings *canvas)
 {
 	DynamicPaintSurface *surface = canvas->surfaces.first;
-	int done = 0;
+	int done = FALSE;
 
 	for (; surface; surface = surface->next) {
 		if (!done && dynamicPaint_surfaceHasColorPreview(surface)) {
 			surface->flags |= MOD_DPAINT_PREVIEW;
-			done = 1;
+			done = TRUE;
 		}
 		else
 			surface->flags &= ~MOD_DPAINT_PREVIEW;
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index 3e25281dd08..f1000a95e95 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -980,9 +980,9 @@ static void emDM_drawMappedFacesGLSL(DerivedMesh *dm,
 	DMVertexAttribs attribs;
 	GPUVertexAttribs gattribs;
 
-	int i, b, matnr, new_matnr, dodraw;
+	int i, b, matnr, new_matnr, do_draw;
 
-	dodraw = 0;
+	do_draw = FALSE;
 	matnr = -1;
 
 	memset(&attribs, 0, sizeof(attribs));
@@ -1026,12 +1026,12 @@ static void emDM_drawMappedFacesGLSL(DerivedMesh *dm,
 
 		new_matnr = efa->mat_nr + 1;
 		if (new_matnr != matnr) {
-			dodraw = setMaterial(matnr = new_matnr, &gattribs);
-			if (dodraw)
+			do_draw = setMaterial(matnr = new_matnr, &gattribs);
+			if (do_draw)
 				DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
 		}
 
-		if (dodraw) {
+		if (do_draw) {
 			glBegin(GL_TRIANGLES);
 			if (!drawSmooth) {
 				if (vertexCos) glNormal3fv(bmdm->polyNos[BM_elem_index_get(efa)]);
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 9d878cd185f..2a0f49262bc 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -505,7 +505,7 @@ void calc_fcurve_bounds(FCurve *fcu, float *xmin, float *xmax, float *ymin, floa
 				BezTriple *bezt;
 				
 				for (bezt = fcu->bezt, i = 0; i < fcu->totvert; bezt++, i++) {
-					if ((do_sel_only == 0) || BEZSELECTED(bezt)) {
+					if ((do_sel_only == FALSE) || BEZSELECTED(bezt)) {
 						if (bezt->vec[1][1] < yminv)
 							yminv = bezt->vec[1][1];
 						if (bezt->vec[1][1] > ymaxv)
@@ -1241,7 +1241,7 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
 	bPoseChannel *pchan;
 	float mat[4][4];
 	float oldEul[3] = {0.0f, 0.0f, 0.0f};
-	short useEulers = 0, rotOrder = ROT_MODE_EUL;
+	short use_eulers = FALSE, rot_order = ROT_MODE_EUL;
 	
 	/* check if this target has valid data */
 	if ((ob == NULL) || (GS(ob->id.name) != ID_OB)) {
@@ -1263,8 +1263,8 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
 		/* bone */
 		if (pchan->rotmode > 0) {
 			copy_v3_v3(oldEul, pchan->eul);
-			rotOrder = pchan->rotmode;
-			useEulers = 1;
+			rot_order = pchan->rotmode;
+			use_eulers = TRUE;
 		}
 		
 		if (dtar->flag & DTAR_FLAG_LOCALSPACE) {
@@ -1290,8 +1290,8 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
 		/* object */
 		if (ob->rotmode > 0) {
 			copy_v3_v3(oldEul, ob->rot);
-			rotOrder = ob->rotmode;
-			useEulers = 1;
+			rot_order = ob->rotmode;
+			use_eulers = TRUE;
 		}
 		
 		if (dtar->flag & DTAR_FLAG_LOCALSPACE) {
@@ -1334,9 +1334,9 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
 		 */
 		float eul[3];
 		
-		mat4_to_eulO(eul, rotOrder, mat);
+		mat4_to_eulO(eul, rot_order, mat);
 		
-		if (useEulers) {
+		if (use_eulers) {
 			compatible_eul(eul, oldEul);
 		}
 		
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 2fc436ab4de..8f077ab107c 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -300,7 +300,7 @@ static void group_replaces_nla(Object *parent, Object *target, char mode)
 {
 	static ListBase nlastrips = {NULL, NULL};
 	static bAction *action = NULL;
-	static int done = 0;
+	static int done = FALSE;
 	bActionStrip *strip, *nstrip;
 	
 	if (mode == 's') {
@@ -314,7 +314,7 @@ static void group_replaces_nla(Object *parent, Object *target, char mode)
 					action = target->action;
 					target->action = NULL;
 					target->nlaflag |= OB_NLA_OVERRIDE;
-					done = 1;
+					done = TRUE;
 				}
 				nstrip = MEM_dupallocN(strip);
 				BLI_addtail(&target->nlastrips, nstrip);
@@ -329,7 +329,7 @@ static void group_replaces_nla(Object *parent, Object *target, char mode)
 			
 			nlastrips.first = nlastrips.last = NULL;  /* not needed, but yah... :) */
 			action = NULL;
-			done = 0;
+			done = FALSE;
 		}
 	}
 }
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 6a69ffb474a..025ea40e82b 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -658,13 +658,15 @@ void curve_deform_verts(Scene *scene, Object *cuOb, Object *target,
 	 */
 	if (target && target->type == OB_MESH) {
 		/* if there's derived data without deformverts, don't use vgroups */
-		if (dm && !dm->getVertData(dm, 0, CD_MDEFORMVERT))
-			use_vgroups = 0;
-		else
-			use_vgroups = 1;
+		if (dm) {
+			use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);
+		}
+		else {
+			use_vgroups = FALSE;
+		}
 	}
 	else {
-		use_vgroups = 0;
+		use_vgroups = FALSE;
 	}
 	
 	if (vgroup && vgroup[0] && use_vgroups) {
@@ -801,13 +803,15 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm,
 	 */
 	if (target && target->type == OB_MESH) {
 		/* if there's derived data without deformverts, don't use vgroups */
-		if (dm && !dm->getVertData(dm, 0, CD_MDEFORMVERT))
-			use_vgroups = 0;
-		else
-			use_vgroups = 1;
+		if (dm) {
+			use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);
+		}
+		else {
+			use_vgroups = FALSE;
+		}
 	}
 	else {
-		use_vgroups = 0;
+		use_vgroups = FALSE;
 	}
 	
 	if (vgroup && vgroup[0] && use_vgroups) {
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 7da0661fef6..bef5f2e18a3 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -351,7 +351,7 @@ void BKE_mball_texspace_calc(Object *ob)
 	DispList *dl;
 	BoundBox *bb;
 	float *data, min[3], max[3] /*, loc[3], size[3] */;
-	int tot, doit = 0;
+	int tot, do_it = FALSE;
 
 	if (ob->bb == NULL) ob->bb = MEM_callocN(sizeof(BoundBox), "mb boundbox");
 	bb = ob->bb;
@@ -364,7 +364,7 @@ void BKE_mball_texspace_calc(Object *ob)
 	dl = ob->disp.first;
 	while (dl) {
 		tot = dl->nr;
-		if (tot) doit = 1;
+		if (tot) do_it = TRUE;
 		data = dl->verts;
 		while (tot--) {
 			/* Also weird... but longer. From utildefines. */
@@ -374,7 +374,7 @@ void BKE_mball_texspace_calc(Object *ob)
 		dl = dl->next;
 	}
 
-	if (!doit) {
+	if (!do_it) {
 		min[0] = min[1] = min[2] = -1.0f;
 		max[0] = max[1] = max[2] = 1.0f;
 	}
@@ -1135,11 +1135,11 @@ static int otherface(int edge, int face)
 
 static void makecubetable(void)
 {
-	static int isdone = 0;
+	static int is_done = FALSE;
 	int i, e, c, done[12], pos[8];
 
-	if (isdone) return;
-	isdone = 1;
+	if (is_done) return;
+	is_done = TRUE;
 
 	for (i = 0; i < 256; i++) {
 		for (e = 0; e < 12; e++) done[e] = 0;
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index f07de7f0127..5dcec603b91 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -195,7 +195,7 @@ static ImBuf *movieclip_load_sequence_file(MovieClip *clip, MovieClipUser *user,
 {
 	struct ImBuf *ibuf;
 	char name[FILE_MAX];
-	int loadflag, use_proxy = 0;
+	int loadflag, use_proxy = FALSE;
 
 	use_proxy = (flag & MCLIP_USE_PROXY) && user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL;
 	if (use_proxy) {
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index c6424580a31..8771e8de67e 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1392,7 +1392,7 @@ static int node_get_deplist_recurs(bNode *node, bNode ***nsort)
 	bNodeSocket *sock;
 	int level = 0xFFF;
 	
-	node->done= 1;
+	node->done = TRUE;
 	
 	/* check linked nodes */
 	for (sock= node->inputs.first; sock; sock= sock->next) {
@@ -1431,7 +1431,7 @@ void ntreeGetDependencyList(struct bNodeTree *ntree, struct bNode ***deplist, in
 	
 	/* first clear data */
 	for (node= ntree->nodes.first; node; node= node->next) {
-		node->done= 0;
+		node->done = FALSE;
 		(*totnodes)++;
 	}
 	if (*totnodes==0) {
@@ -1456,7 +1456,7 @@ static void ntree_update_node_level(bNodeTree *ntree)
 	
 	/* first clear tag */
 	for (node= ntree->nodes.first; node; node= node->next) {
-		node->done= 0;
+		node->done = FALSE;
 	}
 	
 	/* recursive check */
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 8676a3e75a0..4ca9f9c281b 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -614,7 +614,7 @@ typedef struct ParticleRenderData {
 	float viewmat[4][4], winmat[4][4];
 	int winx, winy;
 
-	int dosimplify;
+	int do_simplify;
 	int timeoffset;
 	ParticleRenderElem *elems;
 	int *origindex;
@@ -821,7 +821,7 @@ int psys_render_simplify_distribution(ParticleThreadContext *ctx, int tot)
 	if (data->elems)
 		MEM_freeN(data->elems);
 
-	data->dosimplify = 1;
+	data->do_simplify = TRUE;
 	data->elems = elems;
 	data->origindex = origindex;
 
@@ -960,7 +960,7 @@ int psys_render_simplify_params(ParticleSystem *psys, ChildParticle *cpa, float
 		return 0;
 	
 	data = psys->renderdata;
-	if (!data->dosimplify)
+	if (!data->do_simplify)
 		return 0;
 	
 	b = (data->origindex) ? data->origindex[cpa->num] : cpa->num;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 69808db52b6..f483fd7dc8a 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -2732,7 +2732,7 @@ static void ptcache_dt_to_str(char *str, double dtime)
 
 static void *ptcache_bake_thread(void *ptr)
 {
-	int usetimer = 0, sfra, efra;
+	int use_timer = FALSE, sfra, efra;
 	double stime, ptime, ctime, fetd;
 	char run[32], cur[32], etd[32];
 
@@ -2752,8 +2752,8 @@ static void *ptcache_bake_thread(void *ptr)
 
 			fetd = (ctime-ptime)*(efra-*data->cfra_ptr)/data->step;
 
-			if (usetimer || fetd > 60.0) {
-				usetimer = 1;
+			if (use_timer || fetd > 60.0) {
+				use_timer = TRUE;
 
 				ptcache_dt_to_str(cur, ctime-ptime);
 				ptcache_dt_to_str(run, ctime-stime);
@@ -2765,7 +2765,7 @@ static void *ptcache_bake_thread(void *ptr)
 		}
 	}
 
-	if (usetimer) {
+	if (use_timer) {
 		ptcache_dt_to_str(run, PIL_check_seconds_timer()-stime);
 		printf("Bake %s %s (%i frames simulated).\n", (data->break_operation ? "canceled after" : "finished in"), run, *data->cfra_ptr-sfra);
 	}
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 1f129b1c547..4dfa9f7e12e 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -44,7 +44,8 @@
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_screen.h"
 
@@ -251,7 +252,7 @@ void BKE_spacedata_draw_locks(int set)
 			if (set) 
 				art->do_lock = art->lock;
 			else 
-				art->do_lock = 0;
+				art->do_lock = FALSE;
 		}
 	}
 }
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index ca851fd4c81..fac74d27e0d 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -291,9 +291,9 @@ static ImBuf *do_plugin_effect(
 {
 	char *cp;
 	int float_rendering;
-	int use_temp_bufs = 0; /* Are needed since blur.c (and maybe some other
-	                        * old plugins) do very bad stuff
-	                        * with imbuf-internals */
+	int use_temp_bufs = FALSE; /* Are needed since blur.c (and maybe some other
+	                            * old plugins) do very bad stuff
+	                            * with imbuf-internals */
 
 	struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
 	int x = context.rectx;
@@ -319,7 +319,7 @@ static ImBuf *do_plugin_effect(
 		float_rendering = (out->rect_float != NULL);
 
 		if (seq->plugin->version <= 3 && float_rendering) {
-			use_temp_bufs = 1;
+			use_temp_bufs = TRUE;
 
 			if (ibuf1) {
 				ibuf1 = IMB_dupImBuf(ibuf1);
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 41858eeecb4..a762af960a5 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1464,7 +1464,7 @@ void seq_proxy_rebuild(SeqIndexBuildContext *context, short *stop, short *do_upd
 
 		*progress = (float)cfra / (seq->enddisp - seq->endstill -
 		                           seq->startdisp + seq->startstill);
-		*do_update = 1;
+		*do_update = TRUE;
 
 		if (*stop || G.afbreek)
 			break;
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 1041fb12305..fe7ec83407b 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1685,7 +1685,7 @@ static void sb_sfesf_threads_run(Scene *scene, struct Object *ob, float timenow,
 		else
 			sb_threads[i].ifirst  = 0;
 		sb_threads[i].do_effector = do_effector;
-		sb_threads[i].do_deflector = 0;// not used here
+		sb_threads[i].do_deflector = FALSE;// not used here
 		sb_threads[i].fieldfactor = 0.0f;// not used here
 		sb_threads[i].windfactor  = 0.0f;// not used here
 		sb_threads[i].nr= i;
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index aec54ba827a..ad5bb24e541 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1788,12 +1788,12 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm,
 	int gridFaces = gridSize - 1;
 	int edgeSize = ccgSubSurf_getEdgeSize(ss);
 	DMFlagMat *faceFlags = ccgdm->faceFlags;
-	int a, b, i, doDraw, numVerts, matnr, new_matnr, totface;
+	int a, b, i, do_draw, numVerts, matnr, new_matnr, totface;
 
 	CCG_key_top_level(&key, ss);
 	ccgdm_pbvh_update(ccgdm);
 
-	doDraw = 0;
+	do_draw = 0;
 	matnr = -1;
 
 #define PASSATTRIB(dx, dy, vert) {                                            \
@@ -1837,12 +1837,12 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm,
 		}
 
 		if (new_matnr != matnr) {
-			doDraw = setMaterial(matnr = new_matnr, &gattribs);
-			if (doDraw)
+			do_draw = setMaterial(matnr = new_matnr, &gattribs);
+			if (do_draw)
 				DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
 		}
 
-		if (!doDraw || (setDrawOptions && (origIndex != ORIGINDEX_NONE) &&
+		if (!do_draw || (setDrawOptions && (origIndex != ORIGINDEX_NONE) &&
 		                (setDrawOptions(userData, origIndex) == DM_DRAW_OPTION_SKIP)))
 		{
 			a += gridFaces * gridFaces * numVerts;
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 7634528927a..32cf966b7fd 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -912,7 +912,7 @@ void txt_move_left(Text *text, short sel)
 void txt_move_right(Text *text, short sel) 
 {
 	TextLine **linep;
-	int *charp, oundoing = undoing, do_tab = 0, i;
+	int *charp, oundoing = undoing, do_tab = FALSE, i;
 	
 	if (!text) return;
 	if (sel) txt_curs_sel(text, &linep, &charp);
@@ -931,10 +931,10 @@ void txt_move_right(Text *text, short sel)
 		// do nice right only if there are only spaces
 		// spaces hardcoded in DNA_text_types.h
 		if (text->flags & TXT_TABSTOSPACES && (*linep)->line[*charp] == ' ') {
-			do_tab = 1;
+			do_tab = TRUE;
 			for (i = 0; i < *charp; i++)
 				if ((*linep)->line[i] != ' ') {
-					do_tab = 0;
+					do_tab = FALSE;
 					break;
 				}
 		}