diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-14 20:10:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-14 20:10:46 +0400 |
| commit | bb26d80ad88236800607bed0b0a72a5d14f67bb9 (patch) | |
| tree | eb4882c30fa0bfc6c9a652631717ac740f5d6182 /source/blender/blenkernel | |
| parent | e5407ef8d9fc0973089b2ac69e418179b99bfa18 (diff) | |
code cleanup and move alternate shell calculation method into its own function: BM_vert_calc_shell_factor_ex
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 7c95265b27b..037864c7e38 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2616,12 +2616,12 @@ MINLINE float pow7(float x) { return pow2(pow3(x)) * x; } -static void sphclassical_density_accum_cb(void *userdata, int index, float squared_dist) +static void sphclassical_density_accum_cb(void *userdata, int index, float UNUSED(squared_dist)) { SPHRangeData *pfr = (SPHRangeData *)userdata; ParticleData *npa = pfr->npsys->particles + index; float q; - float qfac = 21.0f / (256.f * M_PI); + float qfac = 21.0f / (256.f * (float)M_PI); float rij, rij_h; float vec[3]; @@ -2647,7 +2647,7 @@ static void sphclassical_density_accum_cb(void *userdata, int index, float squar pfr->data[1] += q / npa->sphdensity; } -static void sphclassical_neighbour_accum_cb(void *userdata, int index, float squared_dist) +static void sphclassical_neighbour_accum_cb(void *userdata, int index, float UNUSED(squared_dist)) { SPHRangeData *pfr = (SPHRangeData *)userdata; ParticleData *npa = pfr->npsys->particles + index; @@ -2699,7 +2699,7 @@ static void sphclassical_force_cb(void *sphdata_v, ParticleKey *state, float *fo int i; - float qfac2 = 42.0f / (256.0f * M_PI); + float qfac2 = 42.0f / (256.0f * (float)M_PI); float rij_h; /* 4.0 here is to be consistent with previous formulation/interface */ |