Cleanup: more int->bool.

25 files changed, 190 insertions, 186 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 526ba618f20..a71f69529b0 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1975,10 +1975,10 @@ bool editbmesh_modifier_is_enabled(Scene *scene, ModifierData *md, DerivedMesh *
 	if (!modifier_isEnabled(scene, md, required_mode)) return 0;
 	if ((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
 		modifier_setError(md, "Modifier requires original data, bad stack position");
-		return 0;
+		return false;
 	}
 	
-	return 1;
+	return true;
 }
 
 static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, DerivedMesh **cage_r,
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index e753a7f7948..c1173cb2391 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -1028,12 +1028,12 @@ bool action_has_motion(const bAction *act)
 	if (act) {
 		for (fcu = act->curves.first; fcu; fcu = fcu->next) {
 			if (fcu->totvert)
-				return 1;
+				return true;
 		}
 	}
 	
 	/* nothing found */
-	return 0;
+	return false;
 }
 
 /* Calculate the extents of given action */
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 5bf458805bd..8e36449f214 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -83,7 +83,7 @@ bool id_type_can_have_animdata(ID *id)
 {
 	/* sanity check */
 	if (id == NULL)
-		return 0;
+		return false;
 
 	/* Only some ID-blocks have this info for now */
 	/* TODO: finish adding this for the other blocktypes */
@@ -102,12 +102,12 @@ bool id_type_can_have_animdata(ID *id)
 		case ID_MSK:
 		case ID_GD:
 		{
-			return 1;
+			return true;
 		}
 		
 		/* no AnimData */
 		default:
-			return 0;
+			return false;
 	}
 }
 
@@ -194,20 +194,20 @@ bool BKE_animdata_set_action(ReportList *reports, ID *id, bAction *act)
 			/* can set */
 			adt->action = act;
 			id_us_plus((ID *)adt->action);
-			ok = 1;
+			ok = true;
 		}
 		else {
 			/* cannot set */
 			BKE_reportf(reports, RPT_ERROR,
 			            "Could not set action '%s' onto ID '%s', as it does not have suitably rooted paths "
 			            "for this purpose", act->id.name + 2, id->name);
-			/* ok = 0; */
+			/* ok = false; */
 		}
 	}
 	else {
 		/* just clearing the action... */
 		adt->action = NULL;
-		ok = 1;
+		ok = true;
 	}
 	
 	return ok;
@@ -290,7 +290,7 @@ bool BKE_copy_animdata_id(ID *id_to, ID *id_from, const bool do_action)
 	AnimData *adt;
 
 	if ((id_to && id_from) && (GS(id_to->name) != GS(id_from->name)))
-		return 0;
+		return false;
 
 	BKE_free_animdata(id_to);
 
@@ -300,7 +300,7 @@ bool BKE_copy_animdata_id(ID *id_to, ID *id_from, const bool do_action)
 		iat->adt = BKE_copy_animdata(adt, do_action);
 	}
 
-	return 1;
+	return true;
 }
 
 void BKE_copy_animdata_id_action(ID *id)
@@ -1353,7 +1353,7 @@ static bool animsys_remap_path(AnimMapper *UNUSED(remap), char *path, char **dst
 
 	/* nothing suitable found, so just set dst to look at path (i.e. no alloc/free needed) */
 	*dst = path;
-	return 0;
+	return false;
 }
 
 
@@ -1382,7 +1382,7 @@ static bool animsys_write_rna_setting(PointerRNA *ptr, char *path, int array_ind
 					       path, array_index, array_len - 1);
 				}
 				
-				return 0;
+				return false;
 			}
 			
 			switch (RNA_property_type(prop)) {
@@ -1436,7 +1436,7 @@ static bool animsys_write_rna_setting(PointerRNA *ptr, char *path, int array_ind
 					break;
 				default:
 					/* nothing can be done here... so it is unsuccessful? */
-					return 0;
+					return false;
 			}
 			
 			/* RNA property update disabled for now - [#28525] [#28690] [#28774] [#28777] */
@@ -1475,7 +1475,7 @@ static bool animsys_write_rna_setting(PointerRNA *ptr, char *path, int array_ind
 		}
 		
 		/* successful */
-		return 1;
+		return true;
 	}
 	else {
 		/* failed to get path */
@@ -1486,7 +1486,7 @@ static bool animsys_write_rna_setting(PointerRNA *ptr, char *path, int array_ind
 			       (ptr->id.data) ? (((ID *)ptr->id.data)->name + 2) : "<No ID>",
 			       path, array_index);
 		}
-		return 0;
+		return false;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 66bd31cfdb4..96f769587d9 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -494,10 +494,11 @@ bool BKE_read_file_from_memory(
 			BLO_update_defaults_startup_blend(bfd->main);
 		setup_app_data(C, bfd, "<memory2>");
 	}
-	else
+	else {
 		BKE_reports_prepend(reports, "Loading failed: ");
+	}
 
-	return (bfd ? 1 : 0);
+	return (bfd != NULL);
 }
 
 /* memfile is the undo buffer */
@@ -517,10 +518,11 @@ bool BKE_read_file_from_memfile(
 		
 		setup_app_data(C, bfd, "<memory1>");
 	}
-	else
+	else {
 		BKE_reports_prepend(reports, "Loading failed: ");
+	}
 
-	return (bfd ? 1 : 0);
+	return (bfd != NULL);
 }
 
 /* only read the userdef from a .blend */
@@ -835,13 +837,13 @@ bool BKE_undo_save_file(const char *filename)
 	int file, oflags;
 
 	if ((U.uiflag & USER_GLOBALUNDO) == 0) {
-		return 0;
+		return false;
 	}
 
 	uel = curundo;
 	if (uel == NULL) {
 		fprintf(stderr, "No undo buffer to save recovery file\n");
-		return 0;
+		return false;
 	}
 
 	/* note: This is currently used for autosave and 'quit.blend', where _not_ following symlinks is OK,
@@ -863,7 +865,7 @@ bool BKE_undo_save_file(const char *filename)
 	if (file == -1) {
 		fprintf(stderr, "Unable to save '%s': %s\n",
 		        filename, errno ? strerror(errno) : "Unknown error opening file");
-		return 0;
+		return false;
 	}
 
 	for (chunk = uel->memfile.chunks.first; chunk; chunk = chunk->next) {
@@ -877,9 +879,9 @@ bool BKE_undo_save_file(const char *filename)
 	if (chunk) {
 		fprintf(stderr, "Unable to save '%s': %s\n",
 		        filename, errno ? strerror(errno) : "Unknown error writing file");
-		return 0;
+		return false;
 	}
-	return 1;
+	return true;
 }
 
 /* sets curscene */
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index cb57a39f89a..4a25a92b385 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -2433,10 +2433,10 @@ static bool poly_gset_compare_fn(const void *k1, const void *k2)
 	    (pk1->totloops == pk2->totloops))
 	{
 		/* Equality - note that this does not mean equality of polys */
-		return 0;
+		return false;
 	}
 	else {
-		return 1;
+		return true;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 10eb8b730ec..8fedf37fb95 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -4395,10 +4395,10 @@ bool BKE_constraint_remove(ListBase *list, bConstraint *con)
 	if (con) {
 		BKE_constraint_free_data(con);
 		BLI_freelinkN(list, con);
-		return 1;
+		return true;
 	}
 	else
-		return 0;
+		return false;
 }
 
 /* ......... */
@@ -4662,15 +4662,15 @@ bool BKE_constraints_proxylocked_owner(Object *ob, bPoseChannel *pchan)
 			
 			/* On bone-level, check if bone is on proxy-protected layer */
 			if ((pchan->bone) && (pchan->bone->layer & arm->layer_protected))
-				return 1;
+				return true;
 		}
 		else {
 			/* FIXME: constraints on object-level are not handled well yet */
-			return 1;
+			return true;
 		}
 	}
 	
-	return 0;
+	return false;
 }
 
 /* -------- Target-Matrix Stuff ------- */
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 8f02ccdd8b2..5e86ca596cf 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1798,7 +1798,8 @@ bool CustomData_free_layer(CustomData *data, int type, int totelem, int index)
 	const int n = index - CustomData_get_layer_index(data, type);
 	int i;
 	
-	if (index < 0) return 0;
+	if (index < 0)
+		return false;
 
 	customData_free_layer__internal(&data->layers[index], totelem);
 
@@ -1828,14 +1829,15 @@ bool CustomData_free_layer(CustomData *data, int type, int totelem, int index)
 
 	customData_update_offsets(data);
 
-	return 1;
+	return true;
 }
 
 bool CustomData_free_layer_active(CustomData *data, int type, int totelem)
 {
 	int index = 0;
 	index = CustomData_get_active_layer_index(data, type);
-	if (index == -1) return 0;
+	if (index == -1)
+		return false;
 	return CustomData_free_layer(data, type, totelem, index);
 }
 
@@ -1942,7 +1944,8 @@ bool CustomData_is_referenced_layer(struct CustomData *data, int type)
 
 	/* get the layer index of the first layer of type */
 	layer_index = CustomData_get_active_layer_index(data, type);
-	if (layer_index == -1) return 0;
+	if (layer_index == -1)
+		return false;
 
 	layer = &data->layers[layer_index];
 
@@ -2260,8 +2263,8 @@ bool CustomData_set_layer_name(const CustomData *data, int type, int n, const ch
 	/* get the layer index of the first layer of type */
 	int layer_index = CustomData_get_layer_index_n(data, type, n);
 
-	if (layer_index == -1) return false;
-	if (!name) return false;
+	if ((layer_index == -1) || !name)
+		return false;
 	
 	BLI_strncpy(data->layers[layer_index].name, name, sizeof(data->layers[layer_index].name));
 	
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 06aa1e23bca..e3fa4733e6c 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -253,20 +253,20 @@ static int dynamicPaint_surfaceNumOfPoints(DynamicPaintSurface *surface)
 bool dynamicPaint_surfaceHasColorPreview(DynamicPaintSurface *surface)
 {
 	if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) {
-		return 0;
+		return false;
 	}
 	else if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
 		if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE ||
 		    surface->type == MOD_DPAINT_SURFACE_T_WAVE)
 		{
-			return 0;
+			return false;
 		}
 		else {
-			return 1;
+			return true;
 		}
 	}
 	else {
-		return 1;
+		return true;
 	}
 }
 
@@ -321,7 +321,7 @@ bool dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, Object
 	else if (output == 1)
 		name = surface->output_name2;
 	else
-		return 0;
+		return false;
 
 	if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
 		if (surface->type == MOD_DPAINT_SURFACE_T_PAINT) {
@@ -332,7 +332,7 @@ bool dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, Object
 			return (defgroup_name_index(ob, surface->output_name) != -1);
 	}
 
-	return 0;
+	return false;
 }
 
 static bool surface_duplicateOutputExists(void *arg, const char *name)
@@ -1102,13 +1102,13 @@ bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, str
 
 			canvas = pmd->canvas = MEM_callocN(sizeof(DynamicPaintCanvasSettings), "DynamicPaint Canvas");
 			if (!canvas)
-				return 0;
+				return false;
 			canvas->pmd = pmd;
 			canvas->dm = NULL;
 
 			/* Create one surface */
 			if (!dynamicPaint_createNewSurface(canvas, scene))
-				return 0;
+				return false;
 
 		}
 		else if (type == MOD_DYNAMICPAINT_TYPE_BRUSH) {
@@ -1118,7 +1118,7 @@ bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, str
 
 			brush = pmd->brush = MEM_callocN(sizeof(DynamicPaintBrushSettings), "DynamicPaint Paint");
 			if (!brush)
-				return 0;
+				return false;
 			brush->pmd = pmd;
 
 			brush->psys = NULL;
@@ -1153,7 +1153,7 @@ bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, str
 
 				brush->paint_ramp = add_colorband(false);
 				if (!brush->paint_ramp)
-					return 0;
+					return false;
 				ramp = brush->paint_ramp->data;
 				/* Add default smooth-falloff ramp.	*/
 				ramp[0].r = ramp[0].g = ramp[0].b = ramp[0].a = 1.0f;
@@ -1169,7 +1169,7 @@ bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, str
 
 				brush->vel_ramp = add_colorband(false);
 				if (!brush->vel_ramp)
-					return 0;
+					return false;
 				ramp = brush->vel_ramp->data;
 				ramp[0].r = ramp[0].g = ramp[0].b = ramp[0].a = ramp[0].pos = 0.0f;
 				ramp[1].r = ramp[1].g = ramp[1].b = ramp[1].a = ramp[1].pos = 1.0f;
@@ -1177,10 +1177,11 @@ bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, str
 			}
 		}
 	}
-	else
-		return 0;
+	else {
+		return false;
+	}
 
-	return 1;
+	return true;
 }
 
 void dynamicPaint_Modifier_copy(struct DynamicPaintModifierData *pmd, struct DynamicPaintModifierData *tpmd)
@@ -1626,12 +1627,12 @@ bool dynamicPaint_resetSurface(Scene *scene, DynamicPaintSurface *surface)
 	if (surface->data) dynamicPaint_freeSurfaceData(surface);
 
 	/* don't reallocate for image sequence types. they get handled only on bake */
-	if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) return 1;
-	if (numOfPoints < 1) return 0;
+	if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) return true;
+	if (numOfPoints < 1) return false;
 
 	/* allocate memory */
 	surface->data = MEM_callocN(sizeof(PaintSurfaceData), "PaintSurfaceData");
-	if (!surface->data) return 0;
+	if (!surface->data) return false;
 
 	/* allocate data depending on surface type and format */
 	surface->data->total_points = numOfPoints;
@@ -1642,7 +1643,7 @@ bool dynamicPaint_resetSurface(Scene *scene, DynamicPaintSurface *surface)
 	if (surface->type == MOD_DPAINT_SURFACE_T_PAINT)
 		dynamicPaint_setInitialColor(scene, surface);
 
-	return 1;
+	return true;
 }
 
 /* make sure allocated surface size matches current requirements */
@@ -1651,7 +1652,7 @@ static bool dynamicPaint_checkSurfaceData(Scene *scene, DynamicPaintSurface *sur
 	if (!surface->data || ((dynamicPaint_surfaceNumOfPoints(surface) != surface->data->total_points))) {
 		return dynamicPaint_resetSurface(scene, surface);
 	}
-	return 1;
+	return true;
 }
 
 
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index d497a3853ea..64300ad6f52 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -687,11 +687,11 @@ bool fcurve_are_keyframes_usable(FCurve *fcu)
 {
 	/* F-Curve must exist */
 	if (fcu == NULL)
-		return 0;
+		return false;
 		
 	/* F-Curve must not have samples - samples are mutually exclusive of keyframes */
 	if (fcu->fpt)
-		return 0;
+		return false;
 	
 	/* if it has modifiers, none of these should "drastically" alter the curve */
 	if (fcu->modifiers.first) {
@@ -718,7 +718,7 @@ bool fcurve_are_keyframes_usable(FCurve *fcu)
 					FMod_Generator *data = (FMod_Generator *)fcm->data;
 					
 					if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
-						return 0;
+						return false;
 					break;
 				}
 				case FMODIFIER_TYPE_FN_GENERATOR:
@@ -726,18 +726,18 @@ bool fcurve_are_keyframes_usable(FCurve *fcu)
 					FMod_FunctionGenerator *data = (FMod_FunctionGenerator *)fcm->data;
 					
 					if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
-						return 0;
+						return false;
 					break;
 				}
 				/* always harmful - cannot allow */
 				default:
-					return 0;
+					return false;
 			}
 		}
 	}
 	
 	/* keyframes are usable */
-	return 1;
+	return true;
 }
 
 bool BKE_fcurve_is_protected(FCurve *fcu)
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index 57b341aaef0..af0db5e1c47 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -1171,7 +1171,7 @@ bool remove_fmodifier(ListBase *modifiers, FModifier *fcm)
 	
 	/* sanity check */
 	if (fcm == NULL)
-		return 0;
+		return false;
 	
 	/* free modifier's special data (stored inside fcm->data) */
 	if (fcm->data) {
@@ -1185,13 +1185,13 @@ bool remove_fmodifier(ListBase *modifiers, FModifier *fcm)
 	/* remove modifier from stack */
 	if (modifiers) {
 		BLI_freelinkN(modifiers, fcm);
-		return 1;
+		return true;
 	}
 	else {
 		/* XXX this case can probably be removed some day, as it shouldn't happen... */
 		printf("remove_fmodifier() - no modifier stack given\n");
 		MEM_freeN(fcm);
-		return 0;
+		return false;
 	}
 }
 
@@ -1262,7 +1262,7 @@ bool list_has_suitable_fmodifier(ListBase *modifiers, int mtype, short acttype)
 		
 	/* sanity checks */
 	if (ELEM(NULL, modifiers, modifiers->first))
-		return 0;
+		return false;
 		
 	/* find the first mdifier fitting these criteria */
 	for (fcm = modifiers->first; fcm; fcm = fcm->next) {
@@ -1277,11 +1277,11 @@ bool list_has_suitable_fmodifier(ListBase *modifiers, int mtype, short acttype)
 			
 		/* if both are ok, we've found a hit */
 		if (mOk && aOk)
-			return 1;
+			return true;
 	}
 	
 	/* no matches */
-	return 0;
+	return false;
 }  
 
 /* Evaluation API --------------------------- */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index eaf173a7382..5c4ebea7d78 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3401,9 +3401,9 @@ bool BKE_image_has_alpha(struct Image *image)
 	BKE_image_release_ibuf(image, ibuf, lock);
 
 	if (planes == 32)
-		return 1;
+		return true;
 	else
-		return 0;
+		return false;
 }
 
 void BKE_image_get_size(Image *image, ImageUser *iuser, int *width, int *height)
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 3f12e3efcc7..7732d592da6 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -575,7 +575,7 @@ static bool where_on_path_deform(Object *ob, float ctime, float vec[4], float di
 	
 	/* test for cyclic */
 	bl = ob->curve_cache->bev.first;
-	if (!bl->nr) return 0;
+	if (!bl->nr) return false;
 	if (bl->poly > -1) cycl = 1;
 
 	if (cycl == 0) {
@@ -608,9 +608,9 @@ static bool where_on_path_deform(Object *ob, float ctime, float vec[4], float di
 				/* weight - not used but could be added */
 			}
 		}
-		return 1;
+		return true;
 	}
-	return 0;
+	return false;
 }
 
 /* for each point, rotate & translate to curve */
@@ -634,9 +634,7 @@ static bool calc_curve_deform(Scene *scene, Object *par, float co[3],
 #endif
 
 	if (par->curve_cache->path == NULL) {
-		return 0;  /* happens on append, cyclic dependencies
-		            * and empty curves
-		            */
+		return false;  /* happens on append, cyclic dependencies and empty curves */
 	}
 
 	/* options */
@@ -718,9 +716,9 @@ static bool calc_curve_deform(Scene *scene, Object *par, float co[3],
 		if (r_quat)
 			copy_qt_qt(r_quat, quat);
 
-		return 1;
+		return true;
 	}
-	return 0;
+	return false;
 }
 
 void curve_deform_verts(Scene *scene, Object *cuOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3],
@@ -939,10 +937,10 @@ bool object_deform_mball(Object *ob, ListBase *dispbase)
 			                     (float(*)[3])dl->verts, dl->nr, NULL, 1.0f);
 		}
 
-		return 1;
+		return true;
 	}
 	else {
-		return 0;
+		return false;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index af2080c1b61..319e6271265 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1137,28 +1137,28 @@ static bool material_in_nodetree(bNodeTree *ntree, Material *mat)
 		if (node->id) {
 			if (GS(node->id->name) == ID_MA) {
 				if (node->id == (ID *)mat) {
-					return 1;
+					return true;
 				}
 			}
 			else if (node->type == NODE_GROUP) {
 				if (material_in_nodetree((bNodeTree *)node->id, mat)) {
-					return 1;
+					return true;
 				}
 			}
 		}
 	}
 
-	return 0;
+	return false;
 }
 
 bool material_in_material(Material *parmat, Material *mat)
 {
 	if (parmat == mat)
-		return 1;
+		return true;
 	else if (parmat->nodetree && parmat->use_nodes)
 		return material_in_nodetree(parmat->nodetree, mat);
 	else
-		return 0;
+		return false;
 }
 
 
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 453c6df6e3b..4c45269cb0b 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -2436,10 +2436,10 @@ bool BKE_mball_center_bounds(MetaBall *mb, float r_cent[3])
 
 	if (BKE_mball_minmax(mb, min, max)) {
 		mid_v3_v3v3(r_cent, min, max);
-		return 1;
+		return true;
 	}
 
-	return 0;
+	return false;
 }
 
 void BKE_mball_transform(MetaBall *mb, float mat[4][4])
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index d89c4877dea..b4d63f8053b 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -567,7 +567,7 @@ bool BKE_nlastrips_has_space(ListBase *strips, float start, float end)
 	
 	/* sanity checks */
 	if ((strips == NULL) || IS_EQF(start, end))
-		return 0;
+		return false;
 	if (start > end) {
 		puts("BKE_nlastrips_has_space() error... start and end arguments swapped");
 		SWAP(float, start, end);
@@ -579,17 +579,17 @@ bool BKE_nlastrips_has_space(ListBase *strips, float start, float end)
 		 * we've gone past the window we need to check for, so things are fine
 		 */
 		if (strip->start >= end)
-			return 1;
+			return true;
 		
 		/* if the end of the strip is greater than either of the boundaries, the range
 		 * must fall within the extents of the strip
 		 */
 		if ((strip->end > start) || (strip->end > end))
-			return 0;
+			return false;
 	}
 	
 	/* if we are still here, we haven't encountered any overlapping strips */
-	return 1;
+	return true;
 }
 
 /* Rearrange the strips in the track so that they are always in order 
@@ -646,11 +646,11 @@ bool BKE_nlastrips_add_strip(ListBase *strips, NlaStrip *strip)
 	
 	/* sanity checks */
 	if (ELEM(NULL, strips, strip))
-		return 0;
+		return false;
 		
 	/* check if any space to add */
 	if (BKE_nlastrips_has_space(strips, strip->start, strip->end) == 0)
-		return 0;
+		return false;
 	
 	/* find the right place to add the strip to the nominated track */
 	for (ns = strips->first; ns; ns = ns->next) {
@@ -667,7 +667,7 @@ bool BKE_nlastrips_add_strip(ListBase *strips, NlaStrip *strip)
 	}
 	
 	/* added... */
-	return 1;
+	return true;
 }
 
 
@@ -785,11 +785,11 @@ bool BKE_nlameta_add_strip(NlaStrip *mstrip, NlaStrip *strip)
 {
 	/* sanity checks */
 	if (ELEM(NULL, mstrip, strip))
-		return 0;
+		return false;
 		
 	/* firstly, check if the meta-strip has space for this */
 	if (BKE_nlastrips_has_space(&mstrip->strips, strip->start, strip->end) == 0)
-		return 0;
+		return false;
 		
 	/* check if this would need to be added to the ends of the meta,
 	 * and subsequently, if the neighboring strips allow us enough room
@@ -803,10 +803,10 @@ bool BKE_nlameta_add_strip(NlaStrip *mstrip, NlaStrip *strip)
 			BLI_addhead(&mstrip->strips, strip);
 			mstrip->start = strip->start;
 			
-			return 1;
+			return true;
 		}
 		else /* failed... no room before */
-			return 0;
+			return false;
 	}
 	else if (strip->end > mstrip->end) {
 		/* check if strip to the right (if it exists) starts before the 
@@ -817,10 +817,10 @@ bool BKE_nlameta_add_strip(NlaStrip *mstrip, NlaStrip *strip)
 			BLI_addtail(&mstrip->strips, strip);
 			mstrip->end = strip->end;
 			
-			return 1;
+			return true;
 		}
 		else /* failed... no room after */
-			return 0;
+			return false;
 	}
 	else {
 		/* just try to add to the meta-strip (no dimension changes needed) */
@@ -988,7 +988,7 @@ bool BKE_nlatrack_has_space(NlaTrack *nlt, float start, float end)
 	 *  - bounds cannot be equal (0-length is nasty)
 	 */
 	if ((nlt == NULL) || (nlt->flag & NLATRACK_PROTECTED) || IS_EQF(start, end))
-		return 0;
+		return false;
 	
 	if (start > end) {
 		puts("BKE_nlatrack_has_space() error... start and end arguments swapped");
@@ -1019,7 +1019,7 @@ bool BKE_nlatrack_add_strip(NlaTrack *nlt, NlaStrip *strip)
 {
 	/* sanity checks */
 	if (ELEM(NULL, nlt, strip))
-		return 0;
+		return false;
 		
 	/* try to add the strip to the track using a more generic function */
 	return BKE_nlastrips_add_strip(&nlt->strips, strip);
@@ -1036,11 +1036,11 @@ bool BKE_nlatrack_get_bounds(NlaTrack *nlt, float bounds[2])
 	if (bounds)
 		bounds[0] = bounds[1] = 0.0f;
 	else
-		return 0;
+		return false;
 	
 	/* sanity checks */
 	if (ELEM(NULL, nlt, nlt->strips.first))
-		return 0;
+		return false;
 		
 	/* lower bound is first strip's start frame */
 	strip = nlt->strips.first;
@@ -1051,7 +1051,7 @@ bool BKE_nlatrack_get_bounds(NlaTrack *nlt, float bounds[2])
 	bounds[1] = strip->end;
 	
 	/* done */
-	return 1;
+	return true;
 }
 
 /* NLA Strips -------------------------------------- */
@@ -1105,7 +1105,7 @@ bool BKE_nlastrip_within_bounds(NlaStrip *strip, float min, float max)
 	
 	/* sanity checks */
 	if ((strip == NULL) || IS_EQF(stripLen, 0.0f) || IS_EQF(boundsLen, 0.0f))
-		return 0;
+		return false;
 	
 	/* only ok if at least part of the strip is within the bounding window
 	 *	- first 2 cases cover when the strip length is less than the bounding area
@@ -1115,17 +1115,17 @@ bool BKE_nlastrip_within_bounds(NlaStrip *strip, float min, float max)
 	    !(IN_RANGE(strip->start, min, max) ||
 	      IN_RANGE(strip->end, min, max)))
 	{
-		return 0;
+		return false;
 	}
 	if ((stripLen > boundsLen) &&
 	    !(IN_RANGE(min, strip->start, strip->end) ||
 	      IN_RANGE(max, strip->start, strip->end)) )
 	{
-		return 0;
+		return false;
 	}
 	
 	/* should be ok! */
-	return 1;
+	return true;
 }
 
 
@@ -1209,11 +1209,11 @@ static bool nlastrip_is_first(AnimData *adt, NlaStrip *strip)
 	
 	/* sanity checks */
 	if (ELEM(NULL, adt, strip))
-		return 0;
+		return false;
 		
 	/* check if strip has any strips before it */
 	if (strip->prev)
-		return 0;
+		return false;
 		
 	/* check other tracks to see if they have a strip that's earlier */
 	/* TODO: or should we check that the strip's track is also the first? */
@@ -1222,12 +1222,12 @@ static bool nlastrip_is_first(AnimData *adt, NlaStrip *strip)
 		ns = nlt->strips.first;
 		if (ns) {
 			if (ns->start < strip->start)
-				return 0;
+				return false;
 		}
 	}
 	
 	/* should be first now */
-	return 1;
+	return true;
 }
 
 /* Animated Strips ------------------------------------------- */
@@ -1239,16 +1239,16 @@ bool BKE_nlatrack_has_animated_strips(NlaTrack *nlt)
 	
 	/* sanity checks */
 	if (ELEM(NULL, nlt, nlt->strips.first))
-		return 0;
+		return false;
 		
 	/* check each strip for F-Curves only (don't care about whether the flags are set) */
 	for (strip = nlt->strips.first; strip; strip = strip->next) {
 		if (strip->fcurves.first)
-			return 1;
+			return true;
 	}
 	
 	/* none found */
-	return 0;
+	return false;
 }
 
 /* Check if given NLA-Tracks have any strips with own F-Curves */
@@ -1258,16 +1258,16 @@ bool BKE_nlatracks_have_animated_strips(ListBase *tracks)
 	
 	/* sanity checks */
 	if (ELEM(NULL, tracks, tracks->first))
-		return 0;
+		return false;
 		
 	/* check each track, stopping on the first hit */
 	for (nlt = tracks->first; nlt; nlt = nlt->next) {
 		if (BKE_nlatrack_has_animated_strips(nlt))
-			return 1;
+			return true;
 	}
 	
 	/* none found */
-	return 0;
+	return false;
 }
 
 /* Validate the NLA-Strips 'control' F-Curves based on the flags set*/
@@ -1587,13 +1587,13 @@ bool BKE_nla_tweakmode_enter(AnimData *adt)
 	
 	/* verify that data is valid */
 	if (ELEM(NULL, adt, adt->nla_tracks.first))
-		return 0;
+		return false;
 		
 	/* if block is already in tweakmode, just leave, but we should report 
 	 * that this block is in tweakmode (as our returncode)
 	 */
 	if (adt->flag & ADT_NLA_EDIT_ON)
-		return 1;
+		return true;
 		
 	/* go over the tracks, finding the active one, and its active strip
 	 *  - if we cannot find both, then there's nothing to do
@@ -1642,7 +1642,7 @@ bool BKE_nla_tweakmode_enter(AnimData *adt)
 			printf("NLA tweakmode enter - neither active requirement found\n");
 			printf("\tactiveTrack = %p, activeStrip = %p\n", (void *)activeTrack, (void *)activeStrip);
 		}
-		return 0;
+		return false;
 	}
 		
 	/* go over all the tracks up to the active one, tagging each strip that uses the same 
@@ -1677,7 +1677,7 @@ bool BKE_nla_tweakmode_enter(AnimData *adt)
 	adt->flag |= ADT_NLA_EDIT_ON;
 	
 	/* done! */
-	return 1;
+	return true;
 }
 
 /* Exit tweakmode for this AnimData block */
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index db27e559a4f..ce86e07ca79 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2293,8 +2293,8 @@ bool ntreeHasType(const bNodeTree *ntree, int type)
 	if (ntree)
 		for (node = ntree->nodes.first; node; node = node->next)
 			if (node->type == type)
-				return 1;
-	return 0;
+				return true;
+	return false;
 }
 
 bool ntreeHasTree(const bNodeTree *ntree, const bNodeTree *lookup)
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index d9e597feefd..a0d1b25a103 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1136,7 +1136,7 @@ static LodLevel *lod_level_select(Object *ob, const float camera_position[3])
 
 bool BKE_object_lod_is_usable(Object *ob, Scene *scene)
 {
-	bool active = (scene) ? ob == OBACT : 0;
+	bool active = (scene) ? ob == OBACT : false;
 	return (ob->mode == OB_MODE_OBJECT || !active);
 }
 
@@ -1402,10 +1402,10 @@ bool BKE_object_pose_context_check(Object *ob)
 	    (ob->pose) &&
 	    (ob->mode & OB_MODE_POSE))
 	{
-		return 1;
+		return true;
 	}
 	else {
-		return 0;
+		return false;
 	}
 }
 
@@ -2401,7 +2401,7 @@ static bool where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat
 
 	/* include framerate */
 	fac1 = (1.0f / (1.0f + fabsf(ob->sf)));
-	if (fac1 >= 1.0f) return 0;
+	if (fac1 >= 1.0f) return false;
 	fac2 = 1.0f - fac1;
 
 	fp1 = obmat[0];
@@ -2410,7 +2410,7 @@ static bool where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat
 		fp1[0] = fac1 * fp1[0] + fac2 * fp2[0];
 	}
 
-	return 1;
+	return true;
 }
 
 /* note, scene is the active scene while actual_scene is the scene the object resides in */
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index ea81d1609d9..96fff339521 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -644,11 +644,11 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob)
 	VirtualModifierData virtualModifierData;
 
 	if (mmd || ob->sculpt->bm)
-		return 0;
+		return false;
 
 	/* non-locked shape keys could be handled in the same way as deformed mesh */
 	if ((ob->shapeflag & OB_SHAPE_LOCK) == 0 && me->key && ob->shapenr)
-		return 1;
+		return true;
 
 	md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
 
@@ -658,11 +658,11 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob)
 		if (!modifier_isEnabled(scene, md, eModifierMode_Realtime)) continue;
 		if (ELEM(md->type, eModifierType_ShapeKey, eModifierType_Multires)) continue;
 
-		if (mti->type == eModifierTypeType_OnlyDeform) return 1;
-		else if ((sd->flags & SCULPT_ONLY_DEFORM) == 0) return 1;
+		if (mti->type == eModifierTypeType_OnlyDeform) return true;
+		else if ((sd->flags & SCULPT_ONLY_DEFORM) == 0) return true;
 	}
 
-	return 0;
+	return false;
 }
 
 /**
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index bfb78024478..d577293fccb 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -981,14 +981,14 @@ bool psys_render_simplify_params(ParticleSystem *psys, ChildParticle *cpa, float
 	int b;
 
 	if (!(psys->renderdata && (psys->part->simplify_flag & PART_SIMPLIFY_ENABLE)))
-		return 0;
+		return false;
 	
 	data = psys->renderdata;
 	if (!data->do_simplify)
-		return 0;
+		return false;
 	b = (data->index_mf_to_mpoly) ? DM_origindex_mface_mpoly(data->index_mf_to_mpoly, data->index_mp_to_orig, cpa->num) : cpa->num;
 	if (b == ORIGINDEX_NONE) {
-		return 0;
+		return false;
 	}
 
 	elem = &data->elems[b];
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index ff6fae08460..bd953890443 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -943,7 +943,7 @@ static bool update_search_cb(PBVHNode *node, void *data_v)
 	if (node->flag & PBVH_Leaf)
 		return (node->flag & flag) != 0;
 
-	return 1;
+	return true;
 }
 
 static void pbvh_update_normals(PBVH *bvh, PBVHNode **nodes,
@@ -1474,10 +1474,10 @@ bool ray_face_intersection(const float ray_start[3],
 	    (t3 && isect_ray_tri_epsilon_v3(ray_start, ray_normal, t0, t2, t3, &dist, NULL, 0.1f) && dist < *fdist))
 	{
 		*fdist = dist;
-		return 1;
+		return true;
 	}
 	else {
-		return 0;
+		return false;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index b0a94cdb764..13e9b7fb0c4 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1116,7 +1116,7 @@ bool BKE_scene_validate_setscene(Main *bmain, Scene *sce)
 	Scene *sce_iter;
 	int a, totscene;
 
-	if (sce->set == NULL) return 1;
+	if (sce->set == NULL) return true;
 	totscene = BLI_listbase_count(&bmain->scene);
 	
 	for (a = 0, sce_iter = sce; sce_iter->set; sce_iter = sce_iter->set, a++) {
@@ -1124,11 +1124,11 @@ bool BKE_scene_validate_setscene(Main *bmain, Scene *sce)
 		if (a > totscene) {
 			/* the tested scene gets zero'ed, that's typically current scene */
 			sce->set = NULL;
-			return 0;
+			return false;
 		}
 	}
 
-	return 1;
+	return true;
 }
 
 /* This function is needed to cope with fractional frames - including two Blender rendering features
@@ -1852,13 +1852,13 @@ bool BKE_scene_remove_render_layer(Main *bmain, Scene *scene, SceneRenderLayer *
 	Scene *sce;
 
 	if (act == -1) {
-		return 0;
+		return false;
 	}
 	else if ( (scene->r.layers.first == scene->r.layers.last) &&
 	          (scene->r.layers.first == srl))
 	{
 		/* ensure 1 layer is kept */
-		return 0;
+		return false;
 	}
 
 	BLI_remlink(&scene->r.layers, srl);
@@ -1880,7 +1880,7 @@ bool BKE_scene_remove_render_layer(Main *bmain, Scene *scene, SceneRenderLayer *
 		}
 	}
 
-	return 1;
+	return true;
 }
 
 /* render simplification */
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 20698cc60e8..999c8fba80f 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3410,7 +3410,7 @@ static bool update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *cha
 	/* recurs downwards to see if this seq depends on the changed seq */
 	
 	if (seq == NULL)
-		return 0;
+		return false;
 	
 	if (seq == changed_seq)
 		free_imbuf = true;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 3b6009872e4..4c46875bd48 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -954,7 +954,7 @@ static bool subframe_updateObject(Scene *scene, Object *ob, int update_mesh, int
 
 	/* if other is dynamic paint canvas, don't update */
 	if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN))
-		return 1;
+		return true;
 
 	/* if object has parents, update them too */
 	if (parent_recursion) {
@@ -966,7 +966,7 @@ static bool subframe_updateObject(Scene *scene, Object *ob, int update_mesh, int
 		/* skip subframe if object is parented
 		 *  to vertex of a dynamic paint canvas */
 		if (is_domain && (ob->partype == PARVERT1 || ob->partype == PARVERT3))
-			return 0;
+			return false;
 
 		/* also update constraint targets */
 		for (con = ob->constraints.first; con; con = con->next) {
@@ -1012,7 +1012,7 @@ static bool subframe_updateObject(Scene *scene, Object *ob, int update_mesh, int
 		BKE_pose_where_is(scene, ob);
 	}
 
-	return 0;
+	return false;
 }
 
 /**********************************************************
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 326f39937f1..77629715edb 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -1515,7 +1515,7 @@ static bool max_undo_test(Text *text, int x)
 			/* XXX error("Undo limit reached, buffer cleared\n"); */
 			MEM_freeN(text->undo_buf);
 			init_undo_text(text);
-			return 0;
+			return false;
 		}
 		else {
 			void *tmp = text->undo_buf;
@@ -1526,7 +1526,7 @@ static bool max_undo_test(Text *text, int x)
 		}
 	}
 
-	return 1;
+	return true;
 }
 
 #if 0  /* UNUSED */
@@ -2550,13 +2550,13 @@ static bool txt_add_char_intern(Text *text, unsigned int add, bool replace_tabs)
 
 	if (add == '\n') {
 		txt_split_curline(text);
-		return 1;
+		return true;
 	}
 	
 	/* insert spaces rather than tabs */
 	if (add == '\t' && replace_tabs) {
 		txt_convert_tab_to_spaces(text);
-		return 1;
+		return true;
 	}
 
 	txt_delete_sel(text);
@@ -2605,7 +2605,7 @@ bool txt_replace_char(Text *text, unsigned int add)
 	size_t del_size = 0, add_size;
 	char ch[BLI_UTF8_MAX];
 
-	if (!text->curl) return 0;
+	if (!text->curl) return false;
 
 	/* If text is selected or we're at the end of the line just use txt_add_char */
 	if (text->curc == text->curl->len || txt_has_sel(text) || add == '\n') {
@@ -2644,7 +2644,7 @@ bool txt_replace_char(Text *text, unsigned int add)
 		text->curc += add_size;
 		txt_pop_sel(text);
 	}
-	return 1;
+	return true;
 }
 
 void txt_indent(Text *text)
@@ -2979,37 +2979,37 @@ bool text_check_delim(const char ch)
 
 	for (a = 0; a < (sizeof(delims) - 1); a++) {
 		if (ch == delims[a])
-			return 1;
+			return true;
 	}
-	return 0;
+	return false;
 }
 
 bool text_check_digit(const char ch)
 {
-	if (ch < '0') return 0;
-	if (ch <= '9') return 1;
-	return 0;
+	if (ch < '0') return false;
+	if (ch <= '9') return true;
+	return false;
 }
 
 bool text_check_identifier(const char ch)
 {
-	if (ch < '0') return 0;
-	if (ch <= '9') return 1;
-	if (ch < 'A') return 0;
-	if (ch <= 'Z' || ch == '_') return 1;
-	if (ch < 'a') return 0;
-	if (ch <= 'z') return 1;
-	return 0;
+	if (ch < '0') return false;
+	if (ch <= '9') return true;
+	if (ch < 'A') return false;
+	if (ch <= 'Z' || ch == '_') return true;
+	if (ch < 'a') return false;
+	if (ch <= 'z') return true;
+	return false;
 }
 
 bool text_check_identifier_nodigit(const char ch)
 {
-	if (ch <= '9') return 0;
-	if (ch < 'A') return 0;
-	if (ch <= 'Z' || ch == '_') return 1;
-	if (ch < 'a') return 0;
-	if (ch <= 'z') return 1;
-	return 0;
+	if (ch <= '9') return false;
+	if (ch < 'A') return false;
+	if (ch <= 'Z' || ch == '_') return true;
+	if (ch < 'a') return false;
+	if (ch <= 'z') return true;
+	return false;
 }
 
 #ifndef WITH_PYTHON
@@ -3027,8 +3027,8 @@ int text_check_identifier_nodigit_unicode(const unsigned int ch)
 bool text_check_whitespace(const char ch)
 {
 	if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n')
-		return 1;
-	return 0;
+		return true;
+	return false;
 }
 
 int text_find_identifier_start(const char *str, int i)
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 9d8dce6232f..7ce08ac649f 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -327,7 +327,7 @@ bool do_colorband(const ColorBand *coba, float in, float out[4])
 	int ipotype;
 	int a;
 	
-	if (coba == NULL || coba->tot == 0) return 0;
+	if (coba == NULL || coba->tot == 0) return false;
 	
 	cbd1 = coba->data;
 
@@ -463,7 +463,7 @@ bool do_colorband(const ColorBand *coba, float in, float out[4])
 			}
 		}
 	}
-	return 1;   /* OK */
+	return true;   /* OK */
 }
 
 void colorband_table_RGBA(ColorBand *coba, float **array, int *size)
@@ -1304,7 +1304,7 @@ bool has_current_material_texture(Material *ma)
 		node = nodeGetActiveID(ma->nodetree, ID_TE);
 
 		if (node)
-			return 1;
+			return true;
 	}
 
 	return (ma != NULL);
@@ -1598,17 +1598,17 @@ void BKE_free_oceantex(struct OceanTex *ot)
 bool BKE_texture_dependsOnTime(const struct Tex *texture)
 {
 	if (texture->ima && BKE_image_is_animated(texture->ima)) {
-		return 1;
+		return true;
 	}
 	else if (texture->adt) {
 		/* assume anything in adt means the texture is animated */
-		return 1;
+		return true;
 	}
 	else if (texture->type == TEX_NOISE) {
 		/* noise always varies with time */
-		return 1;
+		return true;
 	}
-	return 0;
+	return false;
 }
 
 /* ------------------------------------------------------------------------- */