Cleanup: use bool /w flag checks

36 files changed, 204 insertions, 183 deletions

diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index c65a0825a49..215d2484c18 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -199,7 +199,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
 	GlyphBLF *g;
 	FT_Error err;
 	FT_Bitmap bitmap, tempbitmap;
-	int sharp = (U.text_render & USER_TEXT_DISABLE_AA);
+	const bool is_sharp = (U.text_render & USER_TEXT_DISABLE_AA) != 0;
 	int flags = FT_LOAD_TARGET_NORMAL | FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
 	FT_BBox bbox;
 	unsigned int key;
@@ -224,7 +224,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
 	if (font->flags & BLF_HINTING)
 		flags &= ~FT_LOAD_NO_HINTING;
 	
-	if (sharp)
+	if (is_sharp)
 		err = FT_Load_Glyph(font->face, (FT_UInt)index, FT_LOAD_TARGET_MONO);
 	else
 		err = FT_Load_Glyph(font->face, (FT_UInt)index, flags);  
@@ -237,7 +237,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
 	/* get the glyph. */
 	slot = font->face->glyph;
 
-	if (sharp) {
+	if (is_sharp) {
 		err = FT_Render_Glyph(slot, FT_RENDER_MODE_MONO);
 
 		/* Convert result from 1 bit per pixel to 8 bit per pixel */
@@ -266,7 +266,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
 	g->height = (int)bitmap.rows;
 
 	if (g->width && g->height) {
-		if (sharp) {
+		if (is_sharp) {
 			/* Font buffer uses only 0 or 1 values, Blender expects full 0..255 range */
 			int i;
 			for (i = 0; i < (g->width * g->height); i++) {
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index eec2b108ca3..87325a7ff47 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1265,7 +1265,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase,
 
 	dl = dispbase->first;
 	while (dl) {
-		int smooth = dl->rt & CU_SMOOTH ? 1 : 0;
+		const bool is_smooth = (dl->rt & CU_SMOOTH) != 0;
 
 		if (dl->type == DL_SEGM) {
 			startvert = vertcount;
@@ -1344,7 +1344,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase,
 					}
 				}
 
-				if (smooth) mpoly->flag |= ME_SMOOTH;
+				if (is_smooth) mpoly->flag |= ME_SMOOTH;
 				mpoly++;
 				mloop += 3;
 				index += 3;
@@ -1423,7 +1423,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase,
 						}
 					}
 
-					if (smooth) mpoly->flag |= ME_SMOOTH;
+					if (is_smooth) mpoly->flag |= ME_SMOOTH;
 					mpoly++;
 					mloop += 4;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9dd5245dcbf..21d69fe33c3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2639,7 +2639,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open))
 				 * New file versions already have input/output nodes with duplicate links,
 				 * in that case just remove the invalid links.
 				 */
-				int create_io_nodes = (ntree->flag & NTREE_DO_VERSIONS_CUSTOMNODES_GROUP_CREATE_INTERFACE);
+				const bool create_io_nodes = (ntree->flag & NTREE_DO_VERSIONS_CUSTOMNODES_GROUP_CREATE_INTERFACE) != 0;
 				
 				float input_locx = 1000000.0f, input_locy = 0.0f;
 				float output_locx = -1000000.0f, output_locy = 0.0f;
diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c
index 7c53896b969..d319adca388 100644
--- a/source/blender/editors/curve/editcurve_add.c
+++ b/source/blender/editors/curve/editcurve_add.c
@@ -121,7 +121,7 @@ Nurb *add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type
 	const float grid = 1.0f;
 	const int cutype = (type & CU_TYPE); // poly, bezier, nurbs, etc
 	const int stype = (type & CU_PRIMITIVE);
-	const int force_3d = ((Curve *)obedit->data)->flag & CU_3D; /* could be adding to an existing 3D curve */
+	const bool force_3d = (((Curve *)obedit->data)->flag & CU_3D) != 0; /* could be adding to an existing 3D curve */
 
 	unit_m4(umat);
 	unit_m4(viewmat);
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 0d35d3ce716..ffcd204135f 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -761,7 +761,7 @@ static void gp_draw_strokes_edit(bGPDframe *gpf, int offsx, int offsy, int winx,
 {
 	bGPDstroke *gps;
 	
-	const int no_xray = (dflag & GP_DRAWDATA_NO_XRAY);
+	const bool no_xray = (dflag & GP_DRAWDATA_NO_XRAY) != 0;
 	int mask_orig = 0;
 	
 	/* set up depth masks... */
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 8fb6fcbd0d7..f8be5251b53 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -137,7 +137,9 @@ bool EDBM_backbuf_border_mask_init(struct ViewContext *vc, const int mcords[][2]
                                    short xmin, short ymin, short xmax, short ymax);
 bool EDBM_backbuf_circle_init(struct ViewContext *vc, short xs, short ys, short rads);
 
-struct BMVert *EDBM_vert_find_nearest(struct ViewContext *vc, float *r_dist, const bool sel, const bool strict);
+struct BMVert *EDBM_vert_find_nearest(
+        struct ViewContext *vc, float *r_dist,
+        const bool use_select_bias, const bool is_strict);
 struct BMEdge *EDBM_edge_find_nearest(struct ViewContext *vc, float *r_dist);
 struct BMFace *EDBM_face_find_nearest(struct ViewContext *vc, float *r_dist);
 
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index ff4b8a5b631..50199ade929 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -269,9 +269,10 @@ void drawcircball(int mode, const float cent[3], float rad, float tmat[4][4]);
 /* backbuffer select and draw support */
 void view3d_validate_backbuf(struct ViewContext *vc);
 struct ImBuf *view3d_read_backbuf(struct ViewContext *vc, short xmin, short ymin, short xmax, short ymax);
-unsigned int view3d_sample_backbuf_rect(struct ViewContext *vc, const int mval[2], int size,
-                                        unsigned int min, unsigned int max, float *dist, short strict,
-                                        void *handle, bool (*indextest)(void *handle, unsigned int index));
+unsigned int view3d_sample_backbuf_rect(
+        struct ViewContext *vc, const int mval[2], int size,
+        unsigned int min, unsigned int max, float *dist, const bool is_strict,
+        void *handle, bool (*indextest)(void *handle, unsigned int index));
 unsigned int view3d_sample_backbuf(struct ViewContext *vc, int x, int y);
 
 /* draws and does a 4x4 sample */
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 7e767d8f6c8..2efa9e211c9 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -253,7 +253,7 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
 		return;
 
 	if (sc)
-		undistort = sc->clip && (sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT) != 0;
+		undistort = sc->clip && (sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT);
 
 	/* TODO, add this to sequence editor */
 	handle_size = UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE) * U.pixelsize;
@@ -422,7 +422,7 @@ static void mask_draw_curve_type(const bContext *C, MaskSpline *spline, float (*
 	float (*points)[2] = orig_points;
 
 	if (sc) {
-		int undistort = sc->clip && sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT;
+		const bool undistort = sc->clip && (sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT);
 
 		if (undistort) {
 			int i;
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 0c3f69e4996..d5e60cfd7fd 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -390,28 +390,32 @@ static bool findnearestvert__backbufIndextest(void *handle, unsigned int index)
 	return !(eve && BM_elem_flag_test(eve, BM_ELEM_SELECT));
 }
 /**
- * findnearestvert
- * 
- * dist (in/out): minimal distance to the nearest and at the end, actual distance
- * sel: selection bias
- *      if SELECT, selected vertice are given a 5 pixel bias to make them further than unselect verts
- *      if 0, unselected vertice are given the bias
- * strict: if 1, the vertice corresponding to the sel parameter are ignored and not just biased 
+ * Nearest vertex under the cursor.
+ *
+ * \param r_dist (in/out), minimal distance to the nearest and at the end, actual distance
+ * \param use_select_bias
+ * - When true, selected vertice are given a 5 pixel bias to make them further than unselect verts.
+ * - When false, unselected vertice are given the bias.
+ * \param is_strict When true, the vertice corresponding to the sel parameter are ignored and not just biased
  */
-BMVert *EDBM_vert_find_nearest(ViewContext *vc, float *r_dist, const bool sel, const bool strict)
+BMVert *EDBM_vert_find_nearest(
+        ViewContext *vc, float *r_dist,
+        const bool use_select_bias, const bool is_strict)
 {
 	if (vc->v3d->drawtype > OB_WIRE && (vc->v3d->flag & V3D_ZBUF_SELECT)) {
 		float distance;
 		unsigned int index;
 		BMVert *eve;
 		
-		if (strict) {
-			index = view3d_sample_backbuf_rect(vc, vc->mval, 50, bm_wireoffs, 0xFFFFFF, &distance,
-			                                   strict, vc->em, findnearestvert__backbufIndextest);
+		if (is_strict) {
+			index = view3d_sample_backbuf_rect(
+			        vc, vc->mval, 50, bm_wireoffs, 0xFFFFFF, &distance,
+			        is_strict, vc->em, findnearestvert__backbufIndextest);
 		}
 		else {
-			index = view3d_sample_backbuf_rect(vc, vc->mval, 50, bm_wireoffs, 0xFFFFFF, &distance,
-			                                   0, NULL, NULL);
+			index = view3d_sample_backbuf_rect(
+			        vc, vc->mval, 50, bm_wireoffs, 0xFFFFFF, &distance,
+			        0, NULL, NULL);
 		}
 		
 		eve = index ? BM_vert_at_index_find(vc->em->bm, index - 1) : NULL;
@@ -438,9 +442,9 @@ BMVert *EDBM_vert_find_nearest(ViewContext *vc, float *r_dist, const bool sel, c
 		data.lastIndex = lastSelectedIndex;
 		data.mval_fl[0] = vc->mval[0];
 		data.mval_fl[1] = vc->mval[1];
-		data.select = sel ? BM_ELEM_SELECT : 0;
+		data.select = use_select_bias ? BM_ELEM_SELECT : 0;
 		data.dist = *r_dist;
-		data.strict = strict;
+		data.strict = is_strict;
 		data.closest = NULL;
 		data.closestIndex = 0;
 
@@ -653,7 +657,7 @@ static int unified_findnearest(ViewContext *vc, BMVert **r_eve, BMEdge **r_eed,
 	view3d_validate_backbuf(vc);
 	
 	if (em->selectmode & SCE_SELECT_VERTEX)
-		*r_eve = EDBM_vert_find_nearest(vc, &dist, BM_ELEM_SELECT, 0);
+		*r_eve = EDBM_vert_find_nearest(vc, &dist, true, false);
 	if (em->selectmode & SCE_SELECT_FACE)
 		*r_efa = EDBM_face_find_nearest(vc, &dist);
 
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index f885cbbb24f..960b29ae38e 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -2062,7 +2062,7 @@ void ED_vgroup_mirror(Object *ob,
 			/* object mode / weight paint */
 			MVert *mv, *mv_mirr;
 			int vidx, vidx_mirr;
-			const int use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
+			const bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
 
 			if (me->dvert == NULL) {
 				goto cleanup;
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index ded2489e1e5..0a605297a4c 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -338,7 +338,9 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr)
 
 		/* render 3d view */
 		if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
-			/*int is_ortho = scene->r.mode & R_ORTHO;*/
+#if 0
+			const bool is_ortho = (scene->r.mode & R_ORTHO) != 0;
+#endif
 			camera = BKE_camera_multiview_render(oglrender->scene, v3d->camera, viewname);
 			RE_GetCameraWindow(oglrender->re, camera, scene->r.cfra, winmat);
 			if (camera->type == OB_CAMERA) {
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 9bca0fd2976..2a7e736417d 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -209,7 +209,7 @@ static void do_shared_vertex_tesscol(Mesh *me, bool *mfacetag)
 {
 	/* if no mcol: do not do */
 	/* if tface: only the involved faces, otherwise all */
-	const int use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL);
+	const bool use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0;
 	MFace *mface;
 	int a;
 	short *scolmain, *scol;
@@ -280,7 +280,7 @@ static void do_shared_vertex_tesscol(Mesh *me, bool *mfacetag)
 
 static void do_shared_vertexcol(Mesh *me, bool *mlooptag, bool *mfacetag, const bool do_tessface)
 {
-	const int use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL);
+	const bool use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0;
 	MPoly *mp;
 	int (*scol)[4];
 	int i, j;
@@ -1091,7 +1091,7 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	me = BKE_mesh_from_object(vc.obact);
 
 	if (me && me->dvert && vc.v3d && vc.rv3d) {
-		const int use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
+		const bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
 		int v_idx_best = -1;
 		unsigned int index;
 
@@ -1177,7 +1177,7 @@ static EnumPropertyItem *weight_paint_sample_enum_itemf(bContext *C, PointerRNA
 
 			if (me && me->dvert && vc.v3d && vc.rv3d && vc.obact->defbase.first) {
 				const int defbase_tot = BLI_listbase_count(&vc.obact->defbase);
-				const int use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
+				const bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
 				int *groups = MEM_callocN(defbase_tot * sizeof(int), "groups");
 				bool found = false;
 				unsigned int index;
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 87a64e95e63..e27cb041dc5 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -163,14 +163,14 @@ void ED_node_tag_update_nodetree(Main *bmain, bNodeTree *ntree)
 		ntreeTexCheckCyclics(ntree);
 }
 
-static int compare_nodes(bNode *a, bNode *b)
+static bool compare_nodes(const bNode *a, const bNode *b)
 {
 	bNode *parent;
 	/* These tell if either the node or any of the parent nodes is selected.
 	 * A selected parent means an unselected node is also in foreground!
 	 */
-	int a_select = (a->flag & NODE_SELECT), b_select = (b->flag & NODE_SELECT);
-	int a_active = (a->flag & NODE_ACTIVE), b_active = (b->flag & NODE_ACTIVE);
+	bool a_select = (a->flag & NODE_SELECT) != 0, b_select = (b->flag & NODE_SELECT) != 0;
+	bool a_active = (a->flag & NODE_ACTIVE) != 0, b_active = (b->flag & NODE_ACTIVE) != 0;
 	
 	/* if one is an ancestor of the other */
 	/* XXX there might be a better sorting algorithm for stable topological sort, this is O(n^2) worst case */
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c
index b69808d4e81..f1d9d4efcc6 100644
--- a/source/blender/editors/space_node/node_group.c
+++ b/source/blender/editors/space_node/node_group.c
@@ -456,8 +456,8 @@ static int node_group_separate_selected(bNodeTree *ntree, bNodeTree *ngroup, flo
 	
 	/* add internal links to the ntree */
 	for (link = ngroup->links.first; link; link = link_next) {
-		int fromselect = (link->fromnode && (link->fromnode->flag & NODE_SELECT));
-		int toselect = (link->tonode && (link->tonode->flag & NODE_SELECT));
+		const bool fromselect = (link->fromnode && (link->fromnode->flag & NODE_SELECT));
+		const bool toselect = (link->tonode && (link->tonode->flag & NODE_SELECT));
 		link_next = link->next;
 		
 		if (make_copy) {
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 7a7f189b187..769718e1567 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -564,7 +564,10 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar)
 	SpaceSeq *sseq = sa->spacedata.first;
 	Scene *scene = CTX_data_scene(C);
 	wmWindowManager *wm = CTX_wm_manager(C);
-	int show_split = scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW && sseq->mainb == SEQ_DRAW_IMG_IMBUF;
+	const bool show_split = (
+	        scene->ed &&
+	        (scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) &&
+	        (sseq->mainb == SEQ_DRAW_IMG_IMBUF));
 
 	/* XXX temp fix for wrong setting in sseq->mainb */
 	if (sseq->mainb == SEQ_DRAW_SEQUENCE) sseq->mainb = SEQ_DRAW_IMG_IMBUF;
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index b1f8d112765..b374ce64319 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -775,7 +775,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl)
 
 	for (a = 0, mp = mface; a < totpoly; a++, mtpoly++, mp++) {
 		short matnr = mp->mat_nr;
-		int mf_smooth = mp->flag & ME_SMOOTH;
+		const bool mf_smooth = (mp->flag & ME_SMOOTH) != 0;
 		Material *mat = (me->mat) ? me->mat[matnr] : NULL;
 		int mode = mat ? mat->game.flag : GEMAT_INVISIBLE;
 
@@ -1107,7 +1107,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 		Mesh *me = ob->data;
 		TexMatCallback data = {scene, ob, me, dm};
 		bool (*set_face_cb)(void *, int);
-		int glsl, picking = (G.f & G_PICKSEL);
+		bool glsl, picking = (G.f & G_PICKSEL) != 0;
 		
 		/* face hiding callback depending on mode */
 		if (ob == scene->obedit)
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index ece195aa22b..f53fd967daa 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -4225,7 +4225,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 	}
 	
 	if (is_obact && BKE_paint_select_vert_test(ob)) {
-		const int use_depth = (v3d->flag & V3D_ZBUF_SELECT);
+		const bool use_depth = (v3d->flag & V3D_ZBUF_SELECT) != 0;
 		glColor3f(0.0f, 0.0f, 0.0f);
 		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 50ccde6da01..d6691f431dd 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -105,7 +105,7 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob,
 	float cor[3] = {1.0f, 1.0f, 1.0f};
 	int gl_depth = 0, gl_blend = 0;
 
-	int use_fire = (sds->active_fields & SM_ACTIVE_FIRE);
+	const bool use_fire = (sds->active_fields & SM_ACTIVE_FIRE) != 0;
 
 	/* draw slices of smoke is adapted from c++ code authored
 	 * by: Johannes Schmid and Ingemar Rask, 2006, johnny@grob.org */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index fd6288b1601..bfb4f60cdff 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1542,8 +1542,8 @@ ImBuf *view3d_read_backbuf(ViewContext *vc, short xmin, short ymin, short xmax,
 
 /* smart function to sample a rect spiralling outside, nice for backbuf selection */
 unsigned int view3d_sample_backbuf_rect(ViewContext *vc, const int mval[2], int size,
-                                        unsigned int min, unsigned int max, float *r_dist, short strict,
-                                        void *handle, bool (*indextest)(void *handle, unsigned int index))
+        unsigned int min, unsigned int max, float *r_dist, const bool is_strict,
+        void *handle, bool (*indextest)(void *handle, unsigned int index))
 {
 	struct ImBuf *buf;
 	unsigned int *bufmin, *bufmax, *tbuf;
@@ -1577,7 +1577,7 @@ unsigned int view3d_sample_backbuf_rect(ViewContext *vc, const int mval[2], int
 		for (a = 0; a < 2; a++) {
 			for (b = 0; b < nr; b++, distance++) {
 				if (*tbuf && *tbuf >= min && *tbuf < max) {  /* we got a hit */
-					if (strict) {
+					if (is_strict) {
 						indexok =  indextest(handle, *tbuf - min + 1);
 						if (indexok) {
 							*r_dist = sqrtf((float)distance);
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index d0f22ba58c5..587dac722e4 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -725,7 +725,7 @@ static void do_lasso_select_meshobject__doSelectVert(void *userData, MVert *mv,
 }
 static void do_lasso_select_paintvert(ViewContext *vc, const int mcords[][2], short moves, bool extend, bool select)
 {
-	const int use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT);
+	const bool use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0;
 	Object *ob = vc->obact;
 	Mesh *me = ob->data;
 	rcti rect;
@@ -1641,7 +1641,7 @@ static void do_paintvert_box_select__doSelectVert(void *userData, MVert *mv, con
 }
 static int do_paintvert_box_select(ViewContext *vc, rcti *rect, bool select, bool extend)
 {
-	const int use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT);
+	const bool use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0;
 	Mesh *me;
 	MVert *mvert;
 	struct ImBuf *ibuf;
@@ -2185,7 +2185,7 @@ void VIEW3D_OT_select_border(wmOperatorType *ot)
 static bool mouse_weight_paint_vertex_select(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle, Object *obact)
 {
 	View3D *v3d = CTX_wm_view3d(C);
-	const int use_zbuf = (v3d->flag & V3D_ZBUF_SELECT);
+	const bool use_zbuf = (v3d->flag & V3D_ZBUF_SELECT) != 0;
 
 	Mesh *me = obact->data; /* already checked for NULL */
 	unsigned int index = 0;
@@ -2453,7 +2453,7 @@ static void paint_vertsel_circle_select_doSelectVert(void *userData, MVert *mv,
 }
 static void paint_vertsel_circle_select(ViewContext *vc, const bool select, const int mval[2], float rad)
 {
-	const int use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT);
+	const bool use_zbuf = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0;
 	Object *ob = vc->obact;
 	Mesh *me = ob->data;
 	bool bbsel;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index f8e529aa4bf..a7b984fc76a 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -911,7 +911,7 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm
 {
 	if (!(t->flag & T_NO_CONSTRAINT)) {
 		int constraint_axis, constraint_plane;
-		int edit_2d = (t->flag & T_2D_EDIT);
+		const bool edit_2d = (t->flag & T_2D_EDIT) != 0;
 		const char *msg1 = "", *msg2 = "", *msg3 = "";
 		char axis;
 	
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index a5f247d7172..0cdc2b5eb6c 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -341,20 +341,20 @@ static void createTransEdge(TransInfo *t)
 	BMIter iter;
 	float mtx[3][3], smtx[3][3];
 	int count = 0, countsel = 0;
-	int propmode = t->flag & T_PROP_EDIT;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 	int cd_edge_float_offset;
 
 	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
 		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) countsel++;
-			if (propmode) count++;
+			if (is_prop_edit) count++;
 		}
 	}
 
 	if (countsel == 0)
 		return;
 
-	if (propmode) {
+	if (is_prop_edit) {
 		t->total = count;
 	}
 	else {
@@ -380,7 +380,7 @@ static void createTransEdge(TransInfo *t)
 	BLI_assert(cd_edge_float_offset != -1);
 
 	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && (BM_elem_flag_test(eed, BM_ELEM_SELECT) || propmode)) {
+		if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && (BM_elem_flag_test(eed, BM_ELEM_SELECT) || is_prop_edit)) {
 			float *fl_ptr;
 			/* need to set center for center calculations */
 			mid_v3_v3v3(td->center, eed->v1->co, eed->v2->co);
@@ -1330,18 +1330,18 @@ static void createTransMBallVerts(TransInfo *t)
 	TransDataExtension *tx;
 	float mtx[3][3], smtx[3][3];
 	int count = 0, countsel = 0;
-	int propmode = t->flag & T_PROP_EDIT;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 
 	/* count totals */
 	for (ml = mb->editelems->first; ml; ml = ml->next) {
 		if (ml->flag & SELECT) countsel++;
-		if (propmode) count++;
+		if (is_prop_edit) count++;
 	}
 
 	/* note: in prop mode we need at least 1 selected */
 	if (countsel == 0) return;
 
-	if (propmode) t->total = count;
+	if (is_prop_edit) t->total = count;
 	else t->total = countsel;
 
 	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(MBall EditMode)");
@@ -1351,7 +1351,7 @@ static void createTransMBallVerts(TransInfo *t)
 	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
 	for (ml = mb->editelems->first; ml; ml = ml->next) {
-		if (propmode || (ml->flag & SELECT)) {
+		if (is_prop_edit || (ml->flag & SELECT)) {
 			td->loc = &ml->x;
 			copy_v3_v3(td->iloc, td->loc);
 			copy_v3_v3(td->center, td->loc);
@@ -1464,7 +1464,7 @@ static void createTransCurveVerts(TransInfo *t)
 	float mtx[3][3], smtx[3][3];
 	int a;
 	int count = 0, countsel = 0;
-	int propmode = t->flag & T_PROP_EDIT;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 	short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
 	ListBase *nurbs;
 
@@ -1479,13 +1479,13 @@ static void createTransCurveVerts(TransInfo *t)
 				if (bezt->hide == 0) {
 					if (hide_handles) {
 						if (bezt->f2 & SELECT) countsel += 3;
-						if (propmode) count += 3;
+						if (is_prop_edit) count += 3;
 					}
 					else {
 						if (bezt->f1 & SELECT) countsel++;
 						if (bezt->f2 & SELECT) countsel++;
 						if (bezt->f3 & SELECT) countsel++;
-						if (propmode) count += 3;
+						if (is_prop_edit) count += 3;
 					}
 				}
 			}
@@ -1493,7 +1493,7 @@ static void createTransCurveVerts(TransInfo *t)
 		else {
 			for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
 				if (bp->hide == 0) {
-					if (propmode) count++;
+					if (is_prop_edit) count++;
 					if (bp->f1 & SELECT) countsel++;
 				}
 			}
@@ -1502,7 +1502,7 @@ static void createTransCurveVerts(TransInfo *t)
 	/* note: in prop mode we need at least 1 selected */
 	if (countsel == 0) return;
 
-	if (propmode) t->total = count;
+	if (is_prop_edit) t->total = count;
 	else t->total = countsel;
 	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Curve EditMode)");
 
@@ -1537,7 +1537,7 @@ static void createTransCurveVerts(TransInfo *t)
 						}
 					}
 
-					if (propmode ||
+					if (is_prop_edit ||
 					    ((bezt->f2 & SELECT) && hide_handles) ||
 					    ((bezt->f1 & SELECT) && hide_handles == 0))
 					{
@@ -1571,7 +1571,7 @@ static void createTransCurveVerts(TransInfo *t)
 					}
 
 					/* This is the Curve Point, the other two are handles */
-					if (propmode || (bezt->f2 & SELECT)) {
+					if (is_prop_edit || (bezt->f2 & SELECT)) {
 						copy_v3_v3(td->iloc, bezt->vec[1]);
 						td->loc = bezt->vec[1];
 						copy_v3_v3(td->center, td->loc);
@@ -1607,7 +1607,7 @@ static void createTransCurveVerts(TransInfo *t)
 						count++;
 						tail++;
 					}
-					if (propmode ||
+					if (is_prop_edit ||
 					    ((bezt->f2 & SELECT) && hide_handles) ||
 					    ((bezt->f3 & SELECT) && hide_handles == 0))
 					{
@@ -1644,12 +1644,12 @@ static void createTransCurveVerts(TransInfo *t)
 
 					(void)hdata;  /* quiet warning */
 				}
-				else if (propmode && head != tail) {
+				else if (is_prop_edit && head != tail) {
 					calc_distanceCurveVerts(head, tail - 1);
 					head = tail;
 				}
 			}
-			if (propmode && head != tail)
+			if (is_prop_edit && head != tail)
 				calc_distanceCurveVerts(head, tail - 1);
 
 			/* TODO - in the case of tilt and radius we can also avoid allocating the initTransDataCurveHandles
@@ -1664,7 +1664,7 @@ static void createTransCurveVerts(TransInfo *t)
 			head = tail = td;
 			for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
 				if (bp->hide == 0) {
-					if (propmode || (bp->f1 & SELECT)) {
+					if (is_prop_edit || (bp->f1 & SELECT)) {
 						copy_v3_v3(td->iloc, bp->vec);
 						td->loc = bp->vec;
 						copy_v3_v3(td->center, td->loc);
@@ -1689,12 +1689,12 @@ static void createTransCurveVerts(TransInfo *t)
 						tail++;
 					}
 				}
-				else if (propmode && head != tail) {
+				else if (is_prop_edit && head != tail) {
 					calc_distanceCurveVerts(head, tail - 1);
 					head = tail;
 				}
 			}
-			if (propmode && head != tail)
+			if (is_prop_edit && head != tail)
 				calc_distanceCurveVerts(head, tail - 1);
 		}
 	}
@@ -1710,14 +1710,14 @@ static void createTransLatticeVerts(TransInfo *t)
 	float mtx[3][3], smtx[3][3];
 	int a;
 	int count = 0, countsel = 0;
-	int propmode = t->flag & T_PROP_EDIT;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 
 	bp = latt->def;
 	a  = latt->pntsu * latt->pntsv * latt->pntsw;
 	while (a--) {
 		if (bp->hide == 0) {
 			if (bp->f1 & SELECT) countsel++;
-			if (propmode) count++;
+			if (is_prop_edit) count++;
 		}
 		bp++;
 	}
@@ -1725,7 +1725,7 @@ static void createTransLatticeVerts(TransInfo *t)
 	/* note: in prop mode we need at least 1 selected */
 	if (countsel == 0) return;
 
-	if (propmode) t->total = count;
+	if (is_prop_edit) t->total = count;
 	else t->total = countsel;
 	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Lattice EditMode)");
 
@@ -1736,7 +1736,7 @@ static void createTransLatticeVerts(TransInfo *t)
 	bp = latt->def;
 	a  = latt->pntsu * latt->pntsv * latt->pntsw;
 	while (a--) {
-		if (propmode || (bp->f1 & SELECT)) {
+		if (is_prop_edit || (bp->f1 & SELECT)) {
 			if (bp->hide == 0) {
 				copy_v3_v3(td->iloc, bp->vec);
 				td->loc = bp->vec;
@@ -1777,7 +1777,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 	float mat[4][4];
 	int i, k, transformparticle;
 	int count = 0, hasselected = 0;
-	int propmode = t->flag & T_PROP_EDIT;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 
 	if (edit == NULL || t->settings->particle.selectmode == SCE_SELECT_PATH) return;
 
@@ -1799,7 +1799,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 						hasselected = 1;
 						transformparticle = 1;
 					}
-					else if (propmode)
+					else if (is_prop_edit)
 						transformparticle = 1;
 				}
 			}
@@ -1849,7 +1849,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 
 			if (key->flag & PEK_SELECT)
 				td->flag |= TD_SELECTED;
-			else if (!propmode)
+			else if (!is_prop_edit)
 				td->flag |= TD_SKIP;
 
 			unit_m3(td->mtx);
@@ -1878,7 +1878,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 				tx++;
 			tail++;
 		}
-		if (propmode && head != tail)
+		if (is_prop_edit && head != tail)
 			calc_distanceCurveVerts(head, tail - 1);
 	}
 }
@@ -1894,7 +1894,8 @@ void flushTransParticles(TransInfo *t)
 	PTCacheEditKey *key;
 	TransData *td;
 	float mat[4][4], imat[4][4], co[3];
-	int i, k, propmode = t->flag & T_PROP_EDIT;
+	int i, k;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 
 	if (psys)
 		psmd = psys_get_modifier(ob, psys);
@@ -1915,7 +1916,7 @@ void flushTransParticles(TransInfo *t)
 
 
 				/* optimization for proportional edit */
-				if (!propmode || !compare_v3v3(key->co, co, 0.0001f)) {
+				if (!is_prop_edit || !compare_v3v3(key->co, co, 0.0001f)) {
 					copy_v3_v3(key->co, co);
 					point->flag |= PEP_EDIT_RECALC;
 				}
@@ -2282,7 +2283,7 @@ static void createTransEditVerts(TransInfo *t)
 	float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL;
 	float *dists = NULL;
 	int a;
-	int propmode = (t->flag & T_PROP_EDIT) ? (t->flag & T_PROP_EDIT_ALL) : 0;
+	const int prop_mode = (t->flag & T_PROP_EDIT) ? (t->flag & T_PROP_EDIT_ALL) : 0;
 	int mirror = 0;
 	int cd_vert_bweight_offset = -1;
 	bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0;
@@ -2322,7 +2323,7 @@ static void createTransEditVerts(TransInfo *t)
 		cd_vert_bweight_offset = CustomData_get_offset(&bm->vdata, CD_BWEIGHT);
 	}
 
-	if (propmode) {
+	if (prop_mode) {
 		unsigned int count = 0;
 		BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
 			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
@@ -2333,7 +2334,7 @@ static void createTransEditVerts(TransInfo *t)
 		t->total = count;
 
 		/* allocating scratch arrays */
-		if (propmode & T_PROP_CONNECTED)
+		if (prop_mode & T_PROP_CONNECTED)
 			dists = MEM_mallocN(em->bm->totvert * sizeof(float), "scratch nears");
 	}
 	else {
@@ -2355,7 +2356,7 @@ static void createTransEditVerts(TransInfo *t)
 	 * matrix inversion still works and we can still moving along the other */
 	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
 
-	if (propmode & T_PROP_CONNECTED) {
+	if (prop_mode & T_PROP_CONNECTED) {
 		editmesh_set_connectivity_distance(em->bm, mtx, dists);
 	}
 
@@ -2384,7 +2385,7 @@ static void createTransEditVerts(TransInfo *t)
 		{
 			mappedcos = BKE_crazyspace_get_mapped_editverts(t->scene, t->obedit);
 			quats = MEM_mallocN(em->bm->totvert * sizeof(*quats), "crazy quats");
-			BKE_crazyspace_set_quats_editmesh(em, defcos, mappedcos, quats, !propmode);
+			BKE_crazyspace_set_quats_editmesh(em, defcos, mappedcos, quats, !prop_mode);
 			if (mappedcos)
 				MEM_freeN(mappedcos);
 		}
@@ -2409,7 +2410,7 @@ static void createTransEditVerts(TransInfo *t)
 
 	BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, a) {
 		if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
-			if (propmode || BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+			if (prop_mode || BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 				struct TransIslandData *v_island = (island_info && island_vert_map[a] != -1) ?
 				                                   &island_info[island_vert_map[a]] : NULL;
 				float *bweight = (cd_vert_bweight_offset != -1) ? BM_ELEM_CD_GET_VOID_P(eve, cd_vert_bweight_offset) : NULL;
@@ -2422,8 +2423,8 @@ static void createTransEditVerts(TransInfo *t)
 				if (BM_elem_flag_test(eve, BM_ELEM_SELECT))
 					tob->flag |= TD_SELECTED;
 
-				if (propmode) {
-					if (propmode & T_PROP_CONNECTED) {
+				if (prop_mode) {
+					if (prop_mode & T_PROP_CONNECTED) {
 						tob->dist = dists[a];
 					}
 					else {
@@ -2728,15 +2729,15 @@ static void createTransUVs(bContext *C, TransInfo *t)
 	UvElementMap *elementmap = NULL;
 	BLI_bitmap *island_enabled = NULL;
 	int count = 0, countsel = 0, count_rejected = 0;
-	const bool propmode = (t->flag & T_PROP_EDIT) != 0;
-	const bool propconnected = (t->flag & T_PROP_CONNECTED) != 0;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+	const bool is_prop_connected = (t->flag & T_PROP_CONNECTED) != 0;
 
 	const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
 	if (!ED_space_image_show_uvedit(sima, t->obedit)) return;
 
 	/* count */
-	if (propconnected) {
+	if (is_prop_connected) {
 		/* create element map with island information */
 		if (ts->uv_flag & UV_SYNC_SELECTION) {
 			elementmap = BM_uv_element_map_create(em->bm, false, true);
@@ -2760,14 +2761,14 @@ static void createTransUVs(bContext *C, TransInfo *t)
 			if (uvedit_uv_select_test(scene, l, cd_loop_uv_offset)) {
 				countsel++;
 
-				if (propconnected) {
+				if (is_prop_connected) {
 					UvElement *element = BM_uv_element_get(elementmap, efa, l);
 					BLI_BITMAP_ENABLE(island_enabled, element->island);
 				}
 
 			}
 
-			if (propmode) {
+			if (is_prop_edit) {
 				count++;
 			}
 		}
@@ -2775,13 +2776,13 @@ static void createTransUVs(bContext *C, TransInfo *t)
 
 	/* note: in prop mode we need at least 1 selected */
 	if (countsel == 0) {
-		if (propconnected) {
+		if (is_prop_connected) {
 			MEM_freeN(island_enabled);
 		}
 		return;
 	}
 
-	t->total = (propmode) ? count : countsel;
+	t->total = (is_prop_edit) ? count : countsel;
 	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(UV Editing)");
 	/* for each 2d uv coord a 3d vector is allocated, so that they can be
 	 * treated just as if they were 3d verts */
@@ -2798,10 +2799,10 @@ static void createTransUVs(bContext *C, TransInfo *t)
 			continue;
 
 		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
-			if (!propmode && !uvedit_uv_select_test(scene, l, cd_loop_uv_offset))
+			if (!is_prop_edit && !uvedit_uv_select_test(scene, l, cd_loop_uv_offset))
 				continue;
 
-			if (propconnected) {
+			if (is_prop_connected) {
 				UvElement *element = BM_uv_element_get(elementmap, efa, l);
 				if (!BLI_BITMAP_TEST(island_enabled, element->island)) {
 					count_rejected++;
@@ -2814,7 +2815,7 @@ static void createTransUVs(bContext *C, TransInfo *t)
 		}
 	}
 
-	if (propconnected) {
+	if (is_prop_connected) {
 		t->total -= count_rejected;
 		BM_uv_element_map_free(elementmap);
 		MEM_freeN(island_enabled);
@@ -3329,7 +3330,7 @@ static void posttrans_action_clean(bAnimContext *ac, bAction *act)
 /* ----------------------------- */
 
 /* fully select selected beztriples, but only include if it's on the right side of cfra */
-static int count_fcurve_keys(FCurve *fcu, char side, float cfra, bool propedit)
+static int count_fcurve_keys(FCurve *fcu, char side, float cfra, bool is_prop_edit)
 {
 	BezTriple *bezt;
 	int i, count = 0, count_all = 0;
@@ -3349,13 +3350,13 @@ static int count_fcurve_keys(FCurve *fcu, char side, float cfra, bool propedit)
 		}
 	}
 
-	if (propedit && count > 0)
+	if (is_prop_edit && count > 0)
 		return count_all;
 	else return count;
 }
 
 /* fully select selected beztriples, but only include if it's on the right side of cfra */
-static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra, bool propedit)
+static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra, bool is_prop_edit)
 {
 	bGPDframe *gpf;
 	int count = 0, count_all = 0;
@@ -3372,14 +3373,14 @@ static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra, bool prop
 		}
 	}
 	
-	if (propedit && count > 0)
+	if (is_prop_edit && count > 0)
 		return count_all;
 	else
 		return count;
 }
 
 /* fully select selected beztriples, but only include if it's on the right side of cfra */
-static int count_masklayer_frames(MaskLayer *masklay, char side, float cfra, bool propedit)
+static int count_masklayer_frames(MaskLayer *masklay, char side, float cfra, bool is_prop_edit)
 {
 	MaskLayerShape *masklayer_shape;
 	int count = 0, count_all = 0;
@@ -3396,7 +3397,7 @@ static int count_masklayer_frames(MaskLayer *masklay, char side, float cfra, boo
 		}
 	}
 
-	if (propedit && count > 0)
+	if (is_prop_edit && count > 0)
 		return count_all;
 	else
 		return count;
@@ -3426,7 +3427,7 @@ static void TimeToTransData(TransData *td, float *time, AnimData *adt, float ypo
  * The 'side' argument is needed for the extend mode. 'B' = both sides, 'R'/'L' mean only data
  * on the named side are used.
  */
-static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FCurve *fcu, AnimData *adt, char side, float cfra, bool propedit, float ypos)
+static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FCurve *fcu, AnimData *adt, char side, float cfra, bool is_prop_edit, float ypos)
 {
 	BezTriple *bezt;
 	TransData2D *td2d = *td2dv;
@@ -3437,7 +3438,7 @@ static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FC
 
 	for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 		/* only add selected keyframes (for now, proportional edit is not enabled) */
-		if (propedit || (bezt->f2 & SELECT)) { /* note this MUST match count_fcurve_keys(), so can't use BEZSELECTED() macro */
+		if (is_prop_edit || (bezt->f2 & SELECT)) { /* note this MUST match count_fcurve_keys(), so can't use BEZSELECTED() macro */
 			/* only add if on the right 'side' of the current frame */
 			if (FrameOnMouseSide(side, bezt->vec[1][0], cfra)) {
 				TimeToTransData(td, bezt->vec[1], adt, ypos);
@@ -3495,14 +3496,14 @@ void flushTransIntFrameActionData(TransInfo *t)
  * The 'side' argument is needed for the extend mode. 'B' = both sides, 'R'/'L' mean only data
  * on the named side are used.
  */
-static int GPLayerToTransData(TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl, char side, float cfra, bool propedit, float ypos)
+static int GPLayerToTransData(TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl, char side, float cfra, bool is_prop_edit, float ypos)
 {
 	bGPDframe *gpf;
 	int count = 0;
 	
 	/* check for select frames on right side of current frame */
 	for (gpf = gpl->frames.first; gpf; gpf = gpf->next) {
-		if (propedit || (gpf->flag & GP_FRAME_SELECT)) {
+		if (is_prop_edit || (gpf->flag & GP_FRAME_SELECT)) {
 			if (FrameOnMouseSide(side, (float)gpf->framenum, cfra)) {
 				/* memory is calloc'ed, so that should zero everything nicely for us */
 				td->val = &tfd->val;
@@ -3526,14 +3527,14 @@ static int GPLayerToTransData(TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl,
 }
 
 /* refer to comment above #GPLayerToTransData, this is the same but for masks */
-static int MaskLayerToTransData(TransData *td, tGPFtransdata *tfd, MaskLayer *masklay, char side, float cfra, bool propedit, float ypos)
+static int MaskLayerToTransData(TransData *td, tGPFtransdata *tfd, MaskLayer *masklay, char side, float cfra, bool is_prop_edit, float ypos)
 {
 	MaskLayerShape *masklay_shape;
 	int count = 0;
 
 	/* check for select frames on right side of current frame */
 	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
-		if (propedit || (masklay_shape->flag & MASK_SHAPE_SELECT)) {
+		if (is_prop_edit || (masklay_shape->flag & MASK_SHAPE_SELECT)) {
 			if (FrameOnMouseSide(side, (float)masklay_shape->frame, cfra)) {
 				/* memory is calloc'ed, so that should zero everything nicely for us */
 				td->val = &tfd->val;
@@ -3576,7 +3577,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
 	int filter;
-	const bool propedit = (t->flag & T_PROP_EDIT) != 0;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 
 	int count = 0;
 	float cfra;
@@ -3619,11 +3620,11 @@ static void createTransActionData(bContext *C, TransInfo *t)
 			cfra = (float)CFRA;
 		
 		if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE))
-			adt_count = count_fcurve_keys(ale->key_data, t->frame_side, cfra, propedit);
+			adt_count = count_fcurve_keys(ale->key_data, t->frame_side, cfra, is_prop_edit);
 		else if (ale->type == ANIMTYPE_GPLAYER)
-			adt_count = count_gplayer_frames(ale->data, t->frame_side, cfra, propedit);
+			adt_count = count_gplayer_frames(ale->data, t->frame_side, cfra, is_prop_edit);
 		else if (ale->type == ANIMTYPE_MASKLAYER)
-			adt_count = count_masklayer_frames(ale->data, t->frame_side, cfra, propedit);
+			adt_count = count_masklayer_frames(ale->data, t->frame_side, cfra, is_prop_edit);
 		else
 			BLI_assert(0);
 
@@ -3669,7 +3670,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 	for (ale = anim_data.first; ale; ale = ale->next) {
 		AnimData *adt;
 
-		if (propedit && !ale->tag)
+		if (is_prop_edit && !ale->tag)
 			continue;
 
 		adt = ANIM_nla_mapping_get(&ac, ale);
@@ -3682,7 +3683,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 			bGPDlayer *gpl = (bGPDlayer *)ale->data;
 			int i;
 			
-			i = GPLayerToTransData(td, tfd, gpl, t->frame_side, cfra, propedit, ypos);
+			i = GPLayerToTransData(td, tfd, gpl, t->frame_side, cfra, is_prop_edit, ypos);
 			td += i;
 			tfd += i;
 		}
@@ -3690,7 +3691,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 			MaskLayer *masklay = (MaskLayer *)ale->data;
 			int i;
 
-			i = MaskLayerToTransData(td, tfd, masklay, t->frame_side, cfra, propedit, ypos);
+			i = MaskLayerToTransData(td, tfd, masklay, t->frame_side, cfra, is_prop_edit, ypos);
 			td += i;
 			tfd += i;
 		}
@@ -3698,7 +3699,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 			AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
 			FCurve *fcu = (FCurve *)ale->key_data;
 			
-			td = ActionFCurveToTransData(td, &td2d, fcu, adt, t->frame_side, cfra, propedit, ypos);
+			td = ActionFCurveToTransData(td, &td2d, fcu, adt, t->frame_side, cfra, is_prop_edit, ypos);
 		}
 	}
 	
@@ -3728,7 +3729,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 	}
 
 	/* calculate distances for proportional editing */
-	if (propedit) {
+	if (is_prop_edit) {
 		td = t->data;
 
 		for (ale = anim_data.first; ale; ale = ale->next) {
@@ -3976,7 +3977,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 	const bool is_translation_mode = graph_edit_is_translation_mode(t);
 	const bool use_handle = !(sipo->flag & SIPO_NOHANDLES);
 	const bool use_local_center = graph_edit_use_local_center(t);
-	const bool propedit = (t->flag & T_PROP_EDIT) != 0;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 	short anim_map_flag = ANIM_UNITCONV_ONLYSEL | ANIM_UNITCONV_SELVERTS;
 	
 	/* determine what type of data we are operating on */
@@ -4030,7 +4031,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 				const bool sel1 = use_handle ? (bezt->f1 & SELECT) != 0 : sel2;
 				const bool sel3 = use_handle ? (bezt->f3 & SELECT) != 0 : sel2;
 
-				if (propedit) {
+				if (is_prop_edit) {
 					curvecount += 3;
 					if (sel2 || sel1 || sel3)
 						selected = true;
@@ -4054,7 +4055,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 			}
 		}
 
-		if (propedit) {
+		if (is_prop_edit) {
 			if (selected) {
 				count += curvecount;
 				ale->tag = true;
@@ -4110,7 +4111,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 		float cfra;
 
 		/* F-Curve may not have any keyframes */
-		if (fcu->bezt == NULL || (propedit && ale->tag == 0))
+		if (fcu->bezt == NULL || (is_prop_edit && ale->tag == 0))
 			continue;
 
 		/* convert current-frame to action-time (slightly less accurate, especially under
@@ -4133,7 +4134,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 				TransDataCurveHandleFlags *hdata = NULL;
 				/* short h1=1, h2=1; */ /* UNUSED */
 				
-				if (propedit) {
+				if (is_prop_edit) {
 					bool is_sel = (sel2 || sel1 || sel3);
 					/* we always select all handles for proportional editing if central handle is selected */
 					initTransDataCurveHandles(td, bezt);
@@ -4205,7 +4206,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 		testhandles_fcurve(fcu, use_handle);
 	}
 
-	if (propedit) {
+	if (is_prop_edit) {
 		/* loop 2: build transdata arrays */
 		td = t->data;
 
@@ -6317,7 +6318,7 @@ static void createTransObject(bContext *C, TransInfo *t)
 
 	TransData *td = NULL;
 	TransDataExtension *tx;
-	int propmode = t->flag & T_PROP_EDIT;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
 
 	set_trans_object_base_flags(t);
 
@@ -6330,7 +6331,7 @@ static void createTransObject(bContext *C, TransInfo *t)
 		return;
 	}
 	
-	if (propmode) {
+	if (is_prop_edit) {
 		t->total += count_proportional_objects(t);
 	}
 
@@ -6363,7 +6364,7 @@ static void createTransObject(bContext *C, TransInfo *t)
 	}
 	CTX_DATA_END;
 	
-	if (propmode) {
+	if (is_prop_edit) {
 		View3D *v3d = t->view;
 		Base *base;
 
@@ -7120,9 +7121,10 @@ static void MaskHandleToTransData(MaskSplinePoint *point, eMaskWhichHandle which
 	}
 }
 
-static void MaskPointToTransData(Scene *scene, MaskSplinePoint *point,
-                                 TransData *td, TransData2D *td2d, TransDataMasking *tdm,
-                                 const int propmode, const float asp[2])
+static void MaskPointToTransData(
+        Scene *scene, MaskSplinePoint *point,
+        TransData *td, TransData2D *td2d, TransDataMasking *tdm,
+        const bool is_prop_edit, const float asp[2])
 {
 	BezTriple *bezt = &point->bezt;
 	const bool is_sel_point = MASKPOINT_ISSEL_KNOT(point);
@@ -7132,7 +7134,7 @@ static void MaskPointToTransData(Scene *scene, MaskSplinePoint *point,
 	BKE_mask_point_parent_matrix_get(point, CFRA, parent_matrix);
 	invert_m3_m3(parent_inverse_matrix, parent_matrix);
 
-	if (propmode || is_sel_point) {
+	if (is_prop_edit || is_sel_point) {
 		int i;
 
 		tdm->point = point;
@@ -7252,7 +7254,7 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
 	TransData2D *td2d = NULL;
 	TransDataMasking *tdm = NULL;
 	int count = 0, countsel = 0;
-	int propmode = t->flag & T_PROP_EDIT;
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT);
 	float asp[2];
 
 	t->total = 0;
@@ -7302,7 +7304,7 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
 					}
 				}
 
-				if (propmode)
+				if (is_prop_edit)
 					count += 3;
 			}
 		}
@@ -7315,7 +7317,7 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
 
 	ED_mask_get_aspect(t->sa, t->ar, &asp[0], &asp[1]);
 
-	t->total = (propmode) ? count : countsel;
+	t->total = (is_prop_edit) ? count : countsel;
 	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Mask Editing)");
 	/* for each 2d uv coord a 3d vector is allocated, so that they can be
 	 * treated just as if they were 3d verts */
@@ -7338,10 +7340,10 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
 			for (i = 0; i < spline->tot_point; i++) {
 				MaskSplinePoint *point = &spline->points[i];
 
-				if (propmode || MASKPOINT_ISSEL_ANY(point)) {
-					MaskPointToTransData(scene, point, td, td2d, tdm, propmode, asp);
+				if (is_prop_edit || MASKPOINT_ISSEL_ANY(point)) {
+					MaskPointToTransData(scene, point, td, td2d, tdm, is_prop_edit, asp);
 
-					if (propmode || MASKPOINT_ISSEL_KNOT(point)) {
+					if (is_prop_edit || MASKPOINT_ISSEL_KNOT(point)) {
 						td += 3;
 						td2d += 3;
 						tdm += 3;
@@ -7584,8 +7586,8 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 	const Scene *scene = CTX_data_scene(C);
 	const int cfra = CFRA;
 	
-	const int propedit = (t->flag & T_PROP_EDIT);
-	const int propedit_connected = (t->flag & T_PROP_CONNECTED);
+	const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
+	const bool is_prop_edit_connected = (t->flag & T_PROP_CONNECTED) != 0;
 	
 	
 	/* == Grease Pencil Strokes to Transform Data ==
@@ -7616,9 +7618,9 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 					continue;
 				}
 				
-				if (propedit) {
+				if (is_prop_edit) {
 					/* Proportional Editing... */
-					if (propedit_connected) {
+					if (is_prop_edit_connected) {
 						/* connected only - so only if selected */
 						if (gps->flag & GP_STROKE_SELECT)
 							t->total += gps->totpoints;
@@ -7725,8 +7727,8 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 				}
 				
 				/* What we need to include depends on proportional editing settings... */
-				if (propedit) {
-					if (propedit_connected) {
+				if (is_prop_edit) {
+					if (is_prop_edit_connected) {
 						/* A) "Connected" - Only those in selected strokes */
 						stroke_ok = (gps->flag & GP_STROKE_SELECT) != 0;
 					}
@@ -7745,7 +7747,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 					bGPDspoint *pt;
 					int i;
 					
-#if 0	/* XXX: this isn't needed anymore; cannot calculate center this way or propedit breaks */				
+#if 0	/* XXX: this isn't needed anymore; cannot calculate center this way or is_prop_edit breaks */
 					const float ninv = 1.0f / gps->totpoints;
 					float center[3] = {0.0f};
 					
@@ -7760,7 +7762,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 						bool point_ok;
 						
 						/* include point? */
-						if (propedit) {
+						if (is_prop_edit) {
 							/* Always all points in strokes that get included */
 							point_ok = true;
 						}
@@ -7803,7 +7805,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 					}
 					
 					/* March over these points, and calculate the proportional editing distances */
-					if (propedit && (head != tail)) {
+					if (is_prop_edit && (head != tail)) {
 						/* XXX: for now, we are similar enough that this works... */
 						calc_distanceCurveVerts(head, tail - 1);
 					}
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 444c579a62b..2ec7fe677ae 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -3098,9 +3098,10 @@ static bool do_lasso_select_mesh_uv(bContext *C, const int mcords[][2], short mo
 	Scene *scene = CTX_data_scene(C);
 	ToolSettings *ts = scene->toolsettings;
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	const int use_face_center = (ts->uv_flag & UV_SYNC_SELECTION) ?
-	                            (ts->selectmode == SCE_SELECT_FACE) :
-	                            (ts->uv_selectmode == UV_SELECT_FACE);
+	const bool use_face_center = (
+	        (ts->uv_flag & UV_SYNC_SELECTION) ?
+	        (ts->selectmode == SCE_SELECT_FACE) :
+	        (ts->uv_selectmode == UV_SELECT_FACE));
 
 	const int cd_loop_uv_offset  = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 	const int cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 1262f0af95d..f3b89f26703 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -111,8 +111,8 @@ extern "C"
 static struct ExrPass *imb_exr_get_pass(ListBase *lb, char *passname);
 static bool exr_has_multiview(MultiPartInputFile& file);
 static bool exr_has_multipart_file(MultiPartInputFile& file);
-static int exr_has_alpha(MultiPartInputFile& file);
-static int exr_has_zbuffer(MultiPartInputFile& file);
+static bool exr_has_alpha(MultiPartInputFile& file);
+static bool exr_has_zbuffer(MultiPartInputFile& file);
 static void exr_printf(const char *__restrict format, ...);
 static void imb_exr_type_by_channels(ChannelList& channels, StringVector& views,
                                      bool *r_singlelayer, bool *r_multilayer, bool *r_multiview);
@@ -368,8 +368,8 @@ static bool imb_save_openexr_half(ImBuf *ibuf, const char *name, const int flags
                                   ImBuf * (*getbuffer)(void *base, const size_t view_id))
 {
 	const int channels = ibuf->channels;
-	const int is_alpha = (channels >= 4) && (ibuf->planes == 32);
-	const int is_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL; /* summarize */
+	const bool is_alpha = (channels >= 4) && (ibuf->planes == 32);
+	const bool is_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL; /* summarize */
 	const int width = ibuf->x;
 	const int height = ibuf->y;
 	const bool is_multiview = (flags & IB_multiview) && ibuf->userdata;
@@ -485,8 +485,8 @@ static bool imb_save_openexr_float(ImBuf *ibuf, const char *name, const int flag
                                    ImBuf * (*getbuffer)(void *base, const size_t view_id))
 {
 	const int channels = ibuf->channels;
-	const int is_alpha = (channels >= 4) && (ibuf->planes == 32);
-	const int is_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL; /* summarize */
+	const bool is_alpha = (channels >= 4) && (ibuf->planes == 32);
+	const bool is_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL; /* summarize */
 	const int width = ibuf->x;
 	const int height = ibuf->y;
 	const bool is_multiview = (flags & IB_multiview) && ibuf->userdata;
@@ -1266,7 +1266,7 @@ void IMB_exr_multiview_convert(void *handle, void *base,
 	ExrLayer *lay;
 	ExrPass *pass;
 	ImBuf *ibuf = NULL;
-	const int is_alpha = exr_has_alpha(*file);
+	const bool is_alpha = exr_has_alpha(*file);
 	Box2i dw = file->header(0).dataWindow();
 	const size_t width  = dw.max.x - dw.min.x + 1;
 	const size_t height = dw.max.y - dw.min.y + 1;
@@ -1691,12 +1691,12 @@ static bool exr_has_chroma(MultiPartInputFile& file)
 	       file.header(0).channels().findChannel("RY") != NULL;
 }
 
-static int exr_has_zbuffer(MultiPartInputFile& file)
+static bool exr_has_zbuffer(MultiPartInputFile& file)
 {
 	return !(file.header(0).channels().findChannel("Z") == NULL);
 }
 
-static int exr_has_alpha(MultiPartInputFile& file)
+static bool exr_has_alpha(MultiPartInputFile& file)
 {
 	return !(file.header(0).channels().findChannel("A") == NULL);
 }
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 73206ea310c..e2df903ac95 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1009,7 +1009,7 @@ static int rna_GameObjectSettings_physics_type_get(PointerRNA *ptr)
 static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
 {
 	Object *ob = (Object *)ptr->id.data;
-	const int was_navmesh = (ob->gameflag & OB_NAVMESH);
+	const int gameflag_prev = ob->gameflag;
 	ob->body_type = value;
 
 	switch (ob->body_type) {
@@ -1067,7 +1067,7 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
 			break;
 	}
 
-	if (was_navmesh != (ob->gameflag & OB_NAVMESH)) {
+	if ((gameflag_prev & OB_NAVMESH) != (ob->gameflag & OB_NAVMESH)) {
 		if (ob->type == OB_MESH) {
 			/* this is needed to refresh the derived meshes draw func */
 			DAG_id_tag_update(ptr->id.data, OB_RECALC_DATA);
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 8a92deec8eb..542c75f3276 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -163,7 +163,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	switch (dmd->mode) {
 		case MOD_DECIM_MODE_COLLAPSE:
 		{
-			const int do_triangulate = (dmd->flag & MOD_DECIM_FLAG_TRIANGULATE) != 0;
+			const bool do_triangulate = (dmd->flag & MOD_DECIM_FLAG_TRIANGULATE) != 0;
 			BM_mesh_decimate_collapse(bm, dmd->percent, vweights, do_triangulate);
 			break;
 		}
@@ -174,7 +174,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 		}
 		case MOD_DECIM_MODE_DISSOLVE:
 		{
-			const int do_dissolve_boundaries = (dmd->flag & MOD_DECIM_FLAG_ALL_BOUNDARY_VERTS) != 0;
+			const bool do_dissolve_boundaries = (dmd->flag & MOD_DECIM_FLAG_ALL_BOUNDARY_VERTS) != 0;
 			BM_mesh_decimate_dissolve(bm, dmd->angle, do_dissolve_boundaries, (BMO_Delimit)dmd->delimit);
 			break;
 		}
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 5285bc4124d..d34d68d4dee 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -94,7 +94,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
                                    int axis)
 {
 	const float tolerance_sq = mmd->tolerance * mmd->tolerance;
-	const int do_vtargetmap = !(mmd->flag & MOD_MIR_NO_MERGE);
+	const bool do_vtargetmap = (mmd->flag & MOD_MIR_NO_MERGE) != 0;
 	int tot_vtargetmap = 0;  /* total merge vertices */
 
 	DerivedMesh *result;
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 2c9f5e32440..a9160189a7b 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -138,14 +138,14 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	DerivedMesh *dm = derivedData;
 	DerivedMesh *result;
 	ScrewModifierData *ltmd = (ScrewModifierData *) md;
-	const int useRenderParams = flag & MOD_APPLY_RENDER;
+	const bool use_render_params = (flag & MOD_APPLY_RENDER) != 0;
 	
 	int *origindex;
 	int mpoly_index = 0;
 	unsigned int step;
 	unsigned int i, j;
 	unsigned int i1, i2;
-	unsigned int step_tot = useRenderParams ? ltmd->render_steps : ltmd->steps;
+	unsigned int step_tot = use_render_params ? ltmd->render_steps : ltmd->steps;
 	const bool do_flip = ltmd->flag & MOD_SCREW_NORMAL_FLIP ? 1 : 0;
 
 	const int quad_ord[4] = {
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 08b8854c728..c96080d8cf9 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -255,7 +255,7 @@ static DerivedMesh *applyModifier(
 
 	/* weights */
 	MDeformVert *dvert;
-	const int defgrp_invert = ((smd->flag & MOD_SOLIDIFY_VGROUP_INV) != 0);
+	const bool defgrp_invert = (smd->flag & MOD_SOLIDIFY_VGROUP_INV) != 0;
 	int defgrp_index;
 
 	/* array size is doubled in case of using a shell */
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c
index a10386a6f41..113f1654d02 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -139,7 +139,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
 	Image *image = umd->image;
 	MPoly *mpoly, *mp;
 	MLoop *mloop;
-	int override_image = ((umd->flags & MOD_UVPROJECT_OVERRIDEIMAGE) != 0);
+	const bool override_image = (umd->flags & MOD_UVPROJECT_OVERRIDEIMAGE) != 0;
 	Projector projectors[MOD_UVPROJECT_MAXPROJECTORS];
 	int num_projectors = 0;
 	char uvname[MAX_CUSTOMDATA_LAYER_NAME];
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c
index 4433922f9bb..266cfcc59a6 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@ -234,7 +234,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 	int i;
 	/* Flags. */
 #if 0
-	int do_prev = (wmd->modifier.mode & eModifierMode_DoWeightPreview);
+	const bool do_prev = (wmd->modifier.mode & eModifierMode_DoWeightPreview) != 0;
 #endif
 
 	/* Get number of verts. */
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 057674f1144..390475b57f5 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -366,7 +366,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 	int i;
 	/* Flags. */
 #if 0
-	int do_prev = (wmd->modifier.mode & eModifierMode_DoWeightPreview);
+	const bool do_prev = (wmd->modifier.mode & eModifierMode_DoWeightPreview) != 0;
 #endif
 
 #ifdef USE_TIMEIT
diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c
index 6ba85ea5329..de57d4e7ba6 100644
--- a/source/blender/render/intern/source/multires_bake.c
+++ b/source/blender/render/intern/source/multires_bake.c
@@ -127,9 +127,13 @@ typedef struct {
 
 static void multiresbake_get_normal(const MResolvePixelData *data, float norm[],const int face_num, const int vert_index)
 {
-	unsigned int indices[] = {data->mface[face_num].v1, data->mface[face_num].v2,
-	                          data->mface[face_num].v3, data->mface[face_num].v4};
-	const int smoothnormal = (data->mface[face_num].flag & ME_SMOOTH);
+	const unsigned int indices[] = {
+	    data->mface[face_num].v1,
+	    data->mface[face_num].v2,
+	    data->mface[face_num].v3,
+	    data->mface[face_num].v4,
+	};
+	const bool smoothnormal = (data->mface[face_num].flag & ME_SMOOTH) != 0;
 
 	if (!smoothnormal) { /* flat */
 		if (data->precomputed_normals) {
diff --git a/source/blender/render/intern/source/texture_ocean.c b/source/blender/render/intern/source/texture_ocean.c
index 5261374b34d..a932123243d 100644
--- a/source/blender/render/intern/source/texture_ocean.c
+++ b/source/blender/render/intern/source/texture_ocean.c
@@ -73,7 +73,7 @@ int ocean_texture(Tex *tex, const float texvec[2], TexResult *texres)
 		return 0;
 	}
 	else {
-		const int do_normals = (omd->flag & MOD_OCEAN_GENERATE_NORMALS);
+		const bool do_normals = (omd->flag & MOD_OCEAN_GENERATE_NORMALS) != 0;
 		int cfra = R.r.cfra;
 		int retval = TEX_INT;
 
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 2280782f7bd..e79359a078e 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1843,7 +1843,7 @@ static int wm_action_not_handled(int action)
 static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers)
 {
 #ifndef NDEBUG
-	const int do_debug_handler = (G.debug & G_DEBUG_HANDLERS) &&
+	const bool do_debug_handler = (G.debug & G_DEBUG_HANDLERS) &&
 	        /* comment this out to flood the console! (if you really want to test) */
 	        !ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)
 	        ;
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index cb2db94f609..434e47d344e 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -341,7 +341,9 @@ static int wm_macro_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				 * */
 				if (op->opm->type->flag & OPTYPE_BLOCKING) {
 					int bounds[4] = {-1, -1, -1, -1};
-					int wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) && ((op->opm->flag & OP_GRAB_POINTER) || (op->opm->type->flag & OPTYPE_GRAB_POINTER));
+					const bool wrap = (
+					        (U.uiflag & USER_CONTINUOUS_MOUSE) &&
+					        ((op->opm->flag & OP_GRAB_POINTER) || (op->opm->type->flag & OPTYPE_GRAB_POINTER)));
 
 					if (wrap) {
 						ARegion *ar = CTX_wm_region(C);