diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-01-23 17:50:50 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-01-23 17:52:46 +0400 |
commit | c37e8ecc50a36b0e956d0da0ba1de7d6ea803509 (patch) | |
tree | 7208d84027e691053ecd350545ccafae0de2f356 /source/blender/blenkernel/intern/cdderivedmesh.c | |
parent | 26ae14d2dccd0d34edfe9f26a4126e9a69e74983 (diff) |
Cleanup: int/short to bool in BKE_cdderivedmesh.h functions (and TRUE/FALSE to true/false in code using them).
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index a34b6803413..a646f102f28 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1665,7 +1665,7 @@ static void cdDM_foreachMappedFaceCenter( } -void CDDM_recalc_tessellation_ex(DerivedMesh *dm, const int do_face_nor_cpy) +void CDDM_recalc_tessellation_ex(DerivedMesh *dm, const bool do_face_nor_cpy) { CDDerivedMesh *cddm = (CDDerivedMesh *)dm; @@ -1683,7 +1683,7 @@ void CDDM_recalc_tessellation_ex(DerivedMesh *dm, const int do_face_nor_cpy) void CDDM_recalc_tessellation(DerivedMesh *dm) { - CDDM_recalc_tessellation_ex(dm, TRUE); + CDDM_recalc_tessellation_ex(dm, true); } static void cdDM_free_internal(CDDerivedMesh *cddm) @@ -1945,9 +1945,9 @@ static void loops_to_customdata_corners(BMesh *bm, CustomData *facedata, } /* used for both editbmesh and bmesh */ -static DerivedMesh *cddm_from_bmesh_ex(struct BMesh *bm, int use_mdisps, +static DerivedMesh *cddm_from_bmesh_ex(struct BMesh *bm, const bool use_mdisps, /* EditBMesh vars for use_tessface */ - int use_tessface, + const bool use_tessface, const int em_tottri, const BMLoop *(*em_looptris)[3] ) { @@ -2110,14 +2110,14 @@ static DerivedMesh *cddm_from_bmesh_ex(struct BMesh *bm, int use_mdisps, return dm; } -struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, int use_mdisps) +struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, const bool use_mdisps) { - return cddm_from_bmesh_ex(bm, use_mdisps, FALSE, + return cddm_from_bmesh_ex(bm, use_mdisps, false, /* these vars are for editmesh only */ 0, NULL); } -DerivedMesh *CDDM_from_editbmesh(BMEditMesh *em, int use_mdisps, int use_tessface) +DerivedMesh *CDDM_from_editbmesh(BMEditMesh *em, const bool use_mdisps, const bool use_tessface) { return cddm_from_bmesh_ex(em->bm, use_mdisps, /* editmesh */ @@ -2254,7 +2254,7 @@ void CDDM_apply_vert_normals(DerivedMesh *dm, short (*vertNormals)[3]) cddm->dm.dirty &= ~DM_DIRTY_NORMALS; } -void CDDM_calc_normals_mapping_ex(DerivedMesh *dm, const short only_face_normals) +void CDDM_calc_normals_mapping_ex(DerivedMesh *dm, const bool only_face_normals) { CDDerivedMesh *cddm = (CDDerivedMesh *)dm; float (*face_nors)[3] = NULL; @@ -2280,7 +2280,7 @@ void CDDM_calc_normals_mapping_ex(DerivedMesh *dm, const short only_face_normals * Important not to update face normals from polys since it * interferes with assigning the new normal layer in the following code. */ - CDDM_recalc_tessellation_ex(dm, FALSE); + CDDM_recalc_tessellation_ex(dm, false); } else { /* A tessellation already exists, it should always have a CD_ORIGINDEX */ @@ -2306,7 +2306,7 @@ void CDDM_calc_normals_mapping_ex(DerivedMesh *dm, const short only_face_normals void CDDM_calc_normals_mapping(DerivedMesh *dm) { /* use this to skip calculating normals on original vert's, this may need to be changed */ - const short only_face_normals = CustomData_is_referenced_layer(&dm->vertData, CD_MVERT); + const bool only_face_normals = CustomData_is_referenced_layer(&dm->vertData, CD_MVERT); CDDM_calc_normals_mapping_ex(dm, only_face_normals); } |