code cleanup: quiet warnings

3 files changed, 5 insertions, 3 deletions

diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c
index 350f2797bfb..a4b1237bc5d 100644
--- a/source/blender/bmesh/operators/bmo_fill_grid.c
+++ b/source/blender/bmesh/operators/bmo_fill_grid.c
@@ -568,7 +568,7 @@ static void bm_grid_fill(BMesh *bm,
 
 static bool bm_edge_test_cb(BMEdge *e, void *bm_v)
 {
-	return BMO_elem_flag_test((BMesh *)bm_v, e, EDGE_MARK);
+	return BMO_elem_flag_test_bool((BMesh *)bm_v, e, EDGE_MARK);
 }
 
 static bool bm_edge_test_rail_cb(BMEdge *e, void *UNUSED(bm_v))
@@ -686,6 +686,8 @@ void bmo_grid_fill_exec(BMesh *bm, BMOperator *op)
 	             mat_nr, use_smooth, use_interp_simple);
 
 	change = true;
+
+
 cleanup:
 	BM_mesh_edgeloops_free(&eloops);
 	BM_mesh_edgeloops_free(&eloops_rail);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index c69210e2450..96144d13519 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -560,7 +560,7 @@ void ED_object_editmode_enter(bContext *C, int flag)
 static int editmode_toggle_exec(bContext *C, wmOperator *op)
 {
 	const int mode_flag = OB_MODE_EDIT;
-	const bool is_mode_set = CTX_data_edit_object(C);
+	const bool is_mode_set = (CTX_data_edit_object(C) != NULL);
 	ToolSettings *toolsettings =  CTX_data_tool_settings(C);
 
 	if (!is_mode_set) {
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 3f19e77946c..0936d5fcef9 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -109,8 +109,8 @@ static int load_frame_blendervoxel(VoxelData *vd, FILE *fp, int frame)
 static int load_frame_raw8(VoxelData *vd, FILE *fp, int frame)
 {
 	const size_t size = vd_resol_size(vd);
+	size_t i;
 	char *data_c;
-	int i;
 
 	if (is_vd_res_ok(vd) == FALSE)
 		return 0;