Merge branch 'master' into blender2.8

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c
index ed19877ec0f..0087a154f88 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -101,12 +101,12 @@ static void rna_Mesh_free_tangents(Mesh *mesh)
 	CustomData_free_layers(&mesh->ldata, CD_MLOOPTANGENT, mesh->totloop);
 }
 
-static void rna_Mesh_calc_tessface(Mesh *mesh, int free_mpoly)
+static void rna_Mesh_calc_tessface(Mesh *mesh, bool free_mpoly)
 {
 	ED_mesh_calc_tessface(mesh, free_mpoly != 0);
 }
 
-static void rna_Mesh_calc_smooth_groups(Mesh *mesh, int use_bitflags, int *r_poly_group_len,
+static void rna_Mesh_calc_smooth_groups(Mesh *mesh, bool use_bitflags, int *r_poly_group_len,
                                         int **r_poly_group, int *r_group_total)
 {
 	*r_poly_group_len = mesh->totpoly;
@@ -194,7 +194,7 @@ static void rna_Mesh_normals_split_custom_set_from_vertices(
 	DEG_id_tag_update(&mesh->id, 0);
 }
 
-static void rna_Mesh_transform(Mesh *mesh, float *mat, int shape_keys)
+static void rna_Mesh_transform(Mesh *mesh, float *mat, bool shape_keys)
 {
 	BKE_mesh_transform(mesh, (float (*)[4])mat, shape_keys);
 
@@ -210,7 +210,7 @@ static void rna_Mesh_flip_normals(Mesh *mesh)
 	DEG_id_tag_update(&mesh->id, 0);
 }
 
-static void rna_Mesh_split_faces(Mesh *mesh, int free_loop_normals)
+static void rna_Mesh_split_faces(Mesh *mesh, bool free_loop_normals)
 {
 	BKE_mesh_split_faces(mesh, free_loop_normals != 0);
 }