diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 03:27:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:10 +0300 |
| commit | 2e348fd43ee2bc7285fe4461171d51f307dabf92 (patch) | |
| tree | 7e12478710dc214033b2d3e724d48ab4e2b758b5 /source/blender/blenkernel/intern/particle_system.c | |
| parent | bc8504cb4c93eb3aac22222f62966c13560a2bf6 (diff) | |
Cleanup: shadowing (blenkernel)
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 1ed96dc2945..130b56987e2 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1215,8 +1215,8 @@ void psys_get_pointcache_start_end(Scene *scene, ParticleSystem *psys, int *sfra { ParticleSettings *part = psys->part; - *sfra = MAX2(1, (int)part->sta); - *efra = MIN2((int)(part->end + part->lifetime + 1.0f), MAX2(scene->r.pefra, scene->r.efra)); + *sfra = max_ii(1, (int)part->sta); + *efra = min_ii((int)(part->end + part->lifetime + 1.0f), max_ii(scene->r.pefra, scene->r.efra)); } /************************************************/ @@ -1939,7 +1939,7 @@ static void sphclassical_calc_dens(ParticleData *pa, float UNUSED(dfra), SPHData pfr.mass = sphdata->mass; sph_evaluate_func( NULL, psys, pa->state.co, &pfr, interaction_radius, sphclassical_density_accum_cb); - pa->sphdensity = MIN2(MAX2(data[0], fluid->rest_density * 0.9f), fluid->rest_density * 1.1f); + pa->sphdensity = min_ff(max_ff(data[0], fluid->rest_density * 0.9f), fluid->rest_density * 1.1f); } void psys_sph_init(ParticleSimulationData *sim, SPHData *sphdata) @@ -3489,7 +3489,6 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) case PART_PHYS_FLUID: { SPHData sphdata; - ParticleSettings *part = sim->psys->part; psys_sph_init(sim, &sphdata); if (part->fluid->solver == SPH_SOLVER_DDR) { |