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-01-27 20:52:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-27 21:00:04 +0400
commita5c35fb27f090bb716a3bb49a69a56be80dff6d3 (patch)
treec2486c0781d2135c00ee58c78c042ba9d4f87b97 /source/blender/modifiers
parent60287e23b53a273aae56c42502278991dbeee9e7 (diff)
Code cleanup: use booleans where appropriate
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_array.c2
-rw-r--r--source/blender/modifiers/intern/MOD_cast.c4
-rw-r--r--source/blender/modifiers/intern/MOD_laplaciansmooth.c4
-rw-r--r--source/blender/modifiers/intern/MOD_multires.c2
-rw-r--r--source/blender/modifiers/intern/MOD_skin.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index ec5fc4e43b4..d2c44cd1281 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -215,7 +215,7 @@ static void bm_merge_dm_transform(BMesh *bm, DerivedMesh *dm, float mat[4][4],
BMOpSlot dupe_op_slot_args[BMO_OP_MAX_SLOTS], const char *dupe_slot_name,
BMOperator *weld_op)
{
- const int is_input = (dupe_op->slots_in == dupe_op_slot_args);
+ const bool is_input = (dupe_op->slots_in == dupe_op_slot_args);
BMVert *v, *v2, *v3;
BMIter iter;
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 44cf240816e..76a0ed59d06 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -130,7 +130,7 @@ static void sphere_do(
Object *ctrl_ob = NULL;
int i, defgrp_index;
- int has_radius = 0;
+ bool has_radius = false;
short flag, type;
float len = 0.0f;
float fac = cmd->fac;
@@ -250,7 +250,7 @@ static void cuboid_do(
Object *ctrl_ob = NULL;
int i, defgrp_index;
- int has_radius = 0;
+ bool has_radius = false;
short flag;
float fac = cmd->fac;
float facm = 1.0f - fac;
diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
index 9f65915fd26..febd81e2f1b 100644
--- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c
+++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
@@ -285,7 +285,7 @@ static void init_laplacian_matrix(LaplacianSystem *sys)
float areaf;
int i, j;
unsigned int idv1, idv2, idv3, idv4, idv[4];
- int has_4_vert;
+ bool has_4_vert;
for (i = 0; i < sys->numEdges; i++) {
idv1 = sys->medges[i].v1;
idv2 = sys->medges[i].v2;
@@ -405,7 +405,7 @@ static void fill_laplacian_matrix(LaplacianSystem *sys)
float *v1, *v2, *v3, *v4;
float w2, w3, w4;
int i, j;
- int has_4_vert;
+ bool has_4_vert;
unsigned int idv1, idv2, idv3, idv4, idv[4];
for (i = 0; i < sys->numFaces; i++) {
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c
index b3b08ce5c85..c95cd96757f 100644
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -76,7 +76,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm,
Mesh *me = (Mesh *)ob->data;
const int useRenderParams = flag & MOD_APPLY_RENDER;
MultiresFlags flags = 0;
- int has_mask = CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK);
+ const bool has_mask = CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK);
if (mmd->totlvl) {
if (!CustomData_get_layer(&me->ldata, CD_MDISPS)) {
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 1d9f590378d..b5c0ae8b93f 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -141,8 +141,8 @@ static void add_poly(SkinOutput *so,
/***************************** Convex Hull ****************************/
-static int is_quad_symmetric(BMVert *quad[4],
- const SkinModifierData *smd)
+static bool is_quad_symmetric(BMVert *quad[4],
+ const SkinModifierData *smd)
{
const float threshold = 0.0001f;
const float threshold_squared = threshold * threshold;