diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-05 15:36:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-05 15:36:15 +0400 |
| commit | 37026b12ec1047dd5f4637ad281f108a7963af83 (patch) | |
| tree | b45d0b945f84dff6181fe26a464ddbfe0d127f6a /source/blender/editors/physics | |
| parent | 36fc4e15f69f4150812408b32a9052017590eb8b (diff) | |
Code cleanup: use bool for static methods
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 4b2eb694cc7..5288589b6f4 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -415,7 +415,7 @@ static void PE_set_view3d_data(bContext *C, PEData *data) /*************************** selection utilities *******************************/ -static int key_test_depth(PEData *data, const float co[3], const int screen_co[2]) +static bool key_test_depth(PEData *data, const float co[3], const int screen_co[2]) { View3D *v3d= data->vc.v3d; ViewDepths *vd = data->vc.rv3d->depths; @@ -453,7 +453,7 @@ static int key_test_depth(PEData *data, const float co[3], const int screen_co[2 return 1; } -static int key_inside_circle(PEData *data, float rad, const float co[3], float *distance) +static bool key_inside_circle(PEData *data, float rad, const float co[3], float *distance) { float dx, dy, dist; int screen_co[2]; @@ -480,7 +480,7 @@ static int key_inside_circle(PEData *data, float rad, const float co[3], float * return 0; } -static int key_inside_rect(PEData *data, const float co[3]) +static bool key_inside_rect(PEData *data, const float co[3]) { int screen_co[2]; @@ -497,7 +497,7 @@ static int key_inside_rect(PEData *data, const float co[3]) return 0; } -static int key_inside_test(PEData *data, const float co[3]) +static bool key_inside_test(PEData *data, const float co[3]) { if (data->mval) return key_inside_circle(data, data->rad, co, NULL); @@ -505,7 +505,7 @@ static int key_inside_test(PEData *data, const float co[3]) return key_inside_rect(data, co); } -static int point_is_selected(PTCacheEditPoint *point) +static bool point_is_selected(PTCacheEditPoint *point) { KEY_K; diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index b2c780cfdbf..cab4ed6e8b5 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -133,7 +133,7 @@ static float get_fluid_size_m(Scene *scene, Object *domainob, FluidsimSettings * } } -static int fluid_is_animated_mesh(FluidsimSettings *fss) +static bool fluid_is_animated_mesh(FluidsimSettings *fss) { return ((fss->type == OB_FLUIDSIM_CONTROL) || fss->domainNovecgen); } @@ -496,7 +496,7 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length) float *verts=NULL; int *tris=NULL; int numVerts=0, numTris=0; - int deform = fluid_is_animated_mesh(fluidmd->fss); + bool deform = fluid_is_animated_mesh(fluidmd->fss); elbeemMesh fsmesh; |