From c37e8ecc50a36b0e956d0da0ba1de7d6ea803509 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 23 Jan 2014 14:50:50 +0100 Subject: Cleanup: int/short to bool in BKE_cdderivedmesh.h functions (and TRUE/FALSE to true/false in code using them). --- source/blender/modifiers/intern/MOD_armature.c | 4 ++-- source/blender/modifiers/intern/MOD_array.c | 2 +- source/blender/modifiers/intern/MOD_bevel.c | 2 +- source/blender/modifiers/intern/MOD_curve.c | 2 +- source/blender/modifiers/intern/MOD_decimate.c | 2 +- source/blender/modifiers/intern/MOD_edgesplit.c | 2 +- source/blender/modifiers/intern/MOD_lattice.c | 2 +- source/blender/modifiers/intern/MOD_skin.c | 2 +- source/blender/modifiers/intern/MOD_triangulate.c | 2 +- source/blender/modifiers/intern/MOD_util.c | 2 +- source/blender/modifiers/intern/MOD_warp.c | 2 +- source/blender/modifiers/intern/MOD_weightvgproximity.c | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/modifiers/intern') 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); } -- cgit v1.2.3