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 | |
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')
-rw-r--r-- | source/blender/blenkernel/BKE_cdderivedmesh.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 20 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_unwrap_ops.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_curve.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_lattice.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_triangulate.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 2 |
17 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index db06d190b73..4e6d69503c0 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -52,10 +52,10 @@ struct DerivedMesh *CDDM_new(int numVerts, int numEdges, int numFaces, * data to not overwrite the original */ struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh); -struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, int use_mdisps); +struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, const bool use_mdisps); /* creates a CDDerivedMesh from the given BMEditMesh */ -DerivedMesh *CDDM_from_editbmesh(struct BMEditMesh *em, int use_mdisps, int use_tessface); +DerivedMesh *CDDM_from_editbmesh(struct BMEditMesh *em, const bool use_mdisps, const bool use_tessface); /* merge verts */ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int tot_vtargetmap); @@ -95,7 +95,7 @@ void CDDM_apply_vert_normals(struct DerivedMesh *cddm, short (*vertNormals)[3]); /* recalculates vertex and face normals for a CDDerivedMesh */ -void CDDM_calc_normals_mapping_ex(struct DerivedMesh *dm, const short only_face_normals); +void CDDM_calc_normals_mapping_ex(struct DerivedMesh *dm, const bool only_face_normals); void CDDM_calc_normals_mapping(struct DerivedMesh *dm); void CDDM_calc_normals(struct DerivedMesh *dm); void CDDM_calc_normals_tessface(struct DerivedMesh *dm); @@ -112,7 +112,7 @@ void CDDM_calc_edges(struct DerivedMesh *dm); /* reconstitute face triangulation */ void CDDM_recalc_tessellation(struct DerivedMesh *dm); -void CDDM_recalc_tessellation_ex(struct DerivedMesh *dm, const int do_face_nor_cpy); +void CDDM_recalc_tessellation_ex(struct DerivedMesh *dm, const bool do_face_nor_cpy); /* lowers the number of vertices/edges/faces in a CDDerivedMesh * the layer data stays the same size diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 49147db3323..cc0e80c81e9 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -949,7 +949,7 @@ static DerivedMesh *create_orco_dm(Object *ob, Mesh *me, BMEditMesh *em, int lay float (*orco)[3]; int free; - if (em) dm = CDDM_from_editbmesh(em, FALSE, FALSE); + if (em) dm = CDDM_from_editbmesh(em, false, false); else dm = CDDM_from_mesh(me); orco = get_orco_coords_dm(ob, em, layer, &free); @@ -2062,7 +2062,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D } else { - dm = CDDM_from_editbmesh(em, FALSE, FALSE); + dm = CDDM_from_editbmesh(em, false, false); ASSERT_IS_VALID_DM(dm); if (deformedVerts) { 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); } diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 50f987b03c0..b7850c0030e 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -366,7 +366,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[ /* get DerivedMesh */ if (em) { /* target is in editmode, so get a special derived mesh */ - dm = CDDM_from_editbmesh(em, FALSE, FALSE); + dm = CDDM_from_editbmesh(em, false, false); freeDM = 1; } else { diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index ebfef08c284..8a05b33d105 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -399,7 +399,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, B smd.levels = smd_real->levels; smd.subdivType = smd_real->subdivType; - initialDerived = CDDM_from_editbmesh(em, FALSE, FALSE); + initialDerived = CDDM_from_editbmesh(em, false, false); derivedMesh = subsurf_make_derived_from_derived(initialDerived, &smd, NULL, SUBSURF_IN_EDIT_MODE); diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index e81fc44f238..a4248df5ea1 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -141,7 +141,7 @@ static void deformVertsEM( ArmatureModifierData *amd = (ArmatureModifierData *) md; DerivedMesh *dm = derivedData; - if (!derivedData) dm = CDDM_from_editbmesh(em, FALSE, FALSE); + if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ @@ -165,7 +165,7 @@ static void deformMatricesEM( ArmatureModifierData *amd = (ArmatureModifierData *) md; DerivedMesh *dm = derivedData; - if (!derivedData) dm = CDDM_from_editbmesh(em, FALSE, FALSE); + if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 77fa7d8c3f0..ec5fc4e43b4 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -549,7 +549,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, /* Bump the stack level back down to match the adjustment up above */ BMO_pop(bm); - result = CDDM_from_bmesh(bm, FALSE); + result = CDDM_from_bmesh(bm, false); if ((dm->dirty & DM_DIRTY_NORMALS) || ((amd->offset_type & MOD_ARR_OFF_OBJ) && (amd->offset_ob))) diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 0a0f97fdcbe..25577a41f58 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -165,7 +165,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp, dvert, vgroup); - result = CDDM_from_bmesh(bm, TRUE); + result = CDDM_from_bmesh(bm, true); BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index a6ea9920e78..760fa8ffbe8 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -130,7 +130,7 @@ static void deformVertsEM( { DerivedMesh *dm = derivedData; - if (!derivedData) dm = CDDM_from_editbmesh(em, FALSE, FALSE); + if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); deformVerts(md, ob, dm, vertexCos, numVerts, 0); diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 155ccf034d7..b844b9e3bde 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -191,7 +191,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* update for display only */ dmd->face_count = bm->totface; - result = CDDM_from_bmesh(bm, FALSE); + result = CDDM_from_bmesh(bm, false); BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && bm->ftoolflagpool == NULL); /* make sure we never alloc'd these */ diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 609d37a1327..fa29921b325 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -95,7 +95,7 @@ static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd) /* BM_mesh_validate(bm); */ /* for troubleshooting */ - result = CDDM_from_bmesh(bm, TRUE); + result = CDDM_from_bmesh(bm, true); BM_mesh_free(bm); result->dirty |= DM_DIRTY_NORMALS; diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 76db877c229..e4a359a93e2 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -128,7 +128,7 @@ static void deformVertsEM( { DerivedMesh *dm = derivedData; - if (!derivedData) dm = CDDM_from_editbmesh(em, FALSE, FALSE); + if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); deformVerts(md, ob, dm, vertexCos, numVerts, 0); diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index 73297c00084..1d9f590378d 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -1787,7 +1787,7 @@ static DerivedMesh *base_skin(DerivedMesh *origdm, if (!bm) return NULL; - result = CDDM_from_bmesh(bm, FALSE); + result = CDDM_from_bmesh(bm, false); BM_mesh_free(bm); CDDM_calc_edges(result); diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 182c339abfd..4cae3d662db 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -47,7 +47,7 @@ static DerivedMesh *triangulate_dm(DerivedMesh *dm, const int quad_method, const BM_mesh_triangulate(bm, quad_method, ngon_method, false, NULL, NULL); - result = CDDM_from_bmesh(bm, FALSE); + result = CDDM_from_bmesh(bm, false); BM_mesh_free(bm); total_edges = result->getNumEdges(result); diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index e205cd6b12d..feae95bf777 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -183,7 +183,7 @@ DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, /* pass */ } else if (ob->type == OB_MESH) { - if (em) dm = CDDM_from_editbmesh(em, FALSE, FALSE); + if (em) dm = CDDM_from_editbmesh(em, false, false); else dm = CDDM_from_mesh((struct Mesh *)(ob->data)); if (vertexCos) { diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index e6d6c629681..93be31bcad7 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -334,7 +334,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *em, if (use_dm) { if (!derivedData) - dm = CDDM_from_editbmesh(em, FALSE, FALSE); + dm = CDDM_from_editbmesh(em, false, false); } deformVerts(md, ob, dm, vertexCos, numVerts, 0); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index ecb99974472..4ee8494496d 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -471,7 +471,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der else if (obr->type == OB_MESH) { Mesh *me = (Mesh *)obr->data; if (me->edit_btmesh) - target_dm = CDDM_from_editbmesh(me->edit_btmesh, FALSE, FALSE); + target_dm = CDDM_from_editbmesh(me->edit_btmesh, false, false); else target_dm = CDDM_from_mesh(me); } |