Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-04-01 04:34:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-04-01 08:22:28 +0400
commit617557b08ea94e2b65a1697ddf0b79651204d92b (patch)
tree50b24bab075b42fa20456140c9a9681cfb01325b /source/blender/modifiers
parent2c00ecc738c04dc5dc22d4a6b81a1e937526ba6d (diff)
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_mirror.c2
-rw-r--r--source/blender/modifiers/intern/MOD_ocean.c10
-rw-r--r--source/blender/modifiers/intern/MOD_skin.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 7f8fb851668..a3ac09d87f2 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -272,7 +272,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
MDeformVert *dvert = (MDeformVert *) CustomData_get_layer(&result->vertData, CD_MDEFORMVERT) + maxVerts;
int *flip_map = NULL, flip_map_len = 0;
- flip_map = defgroup_flip_map(ob, &flip_map_len, FALSE);
+ flip_map = defgroup_flip_map(ob, &flip_map_len, false);
if (flip_map) {
for (i = 0; i < maxVerts; dvert++, i++) {
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index e5d9a9dae0e..91b1b2cbbca 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -64,7 +64,7 @@ static void clear_cache_data(struct OceanModifierData *omd)
{
BKE_free_ocean_cache(omd->oceancache);
omd->oceancache = NULL;
- omd->cached = FALSE;
+ omd->cached = false;
}
/* keep in sync with init_ocean_modifier_bake(), object_modifier.c */
@@ -74,7 +74,7 @@ static void init_ocean_modifier(struct OceanModifierData *omd)
if (!omd || !omd->ocean) return;
- do_heightfield = TRUE;
+ do_heightfield = true;
do_chop = (omd->chop_amount > 0);
do_normals = (omd->flag & MOD_OCEAN_GENERATE_NORMALS);
do_jacobian = (omd->flag & MOD_OCEAN_GENERATE_FOAM);
@@ -442,7 +442,7 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob,
omd->refresh = 0;
/* do ocean simulation */
- if (omd->cached == TRUE) {
+ if (omd->cached == true) {
if (!omd->oceancache) init_cache_data(ob, omd);
BKE_simulate_ocean_cache(omd->oceancache, md->scene->r.cfra);
}
@@ -495,7 +495,7 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob,
const float u = OCEAN_CO(size_co_inv, co[0]);
const float v = OCEAN_CO(size_co_inv, co[1]);
- if (omd->oceancache && omd->cached == TRUE) {
+ if (omd->oceancache && omd->cached == true) {
BKE_ocean_cache_eval_uv(omd->oceancache, &ocr, cfra, u, v);
foam = ocr.foam;
CLAMP(foam, 0.0f, 1.0f);
@@ -523,7 +523,7 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob,
const float u = OCEAN_CO(size_co_inv, mv->co[0]);
const float v = OCEAN_CO(size_co_inv, mv->co[1]);
- if (omd->oceancache && omd->cached == TRUE)
+ if (omd->oceancache && omd->cached == true)
BKE_ocean_cache_eval_uv(omd->oceancache, &ocr, cfra, u, v);
else
BKE_ocean_eval_uv(omd->ocean, &ocr, u, v);
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 8afcc5a9c9e..6dc3f9cf240 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -217,7 +217,7 @@ static bool skin_frame_find_contained_faces(const Frame *frame,
return false;
}
-/* Returns true if hull is successfully built, FALSE otherwise */
+/* Returns true if hull is successfully built, false otherwise */
static bool build_hull(SkinOutput *so, Frame **frames, int totframe)
{
BMesh *bm = so->bm;
@@ -1664,7 +1664,7 @@ static void skin_smooth_hulls(BMesh *bm, SkinNode *skin_nodes,
BM_data_layer_free_n(bm, &bm->vdata, CD_SHAPEKEY, skey);
}
-/* Returns TRUE if all hulls are successfully built, false otherwise */
+/* Returns true if all hulls are successfully built, false otherwise */
static bool skin_output_branch_hulls(SkinOutput *so, SkinNode *skin_nodes,
int totvert, const MeshElemMap *emap,
const MEdge *medge)