diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-30 13:23:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-30 13:23:06 +0400 |
commit | 50ca81154e5ead104723ba137942e92cb860ace8 (patch) | |
tree | 31c1c97893da5d6eec3d1cdc6af0f400e911391d /source/blender/blenkernel/intern/particle_system.c | |
parent | 7ee3da151d781bd3bac69958bb7d5d6b5cde125e (diff) | |
parent | 6d965f4493871c9bd4550939b8263d0c509b7c41 (diff) |
svn merge ^/trunk/blender -r42973:42991
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 7a5f5524fbd..45b0fb80944 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -108,7 +108,8 @@ /* Reacting to system events */ /************************************************/ -static int particles_are_dynamic(ParticleSystem *psys) { +static int particles_are_dynamic(ParticleSystem *psys) +{ if(psys->pointcache->flag & PTCACHE_BAKED) return 0; @@ -2241,7 +2242,8 @@ static void sph_spring_delete(ParticleSystem *psys, int j) psys->fluid_springs = (ParticleSpring*)MEM_reallocN(psys->fluid_springs, psys->alloc_fluidsprings * sizeof(ParticleSpring)); } } -static void sph_springs_modify(ParticleSystem *psys, float dtime){ +static void sph_springs_modify(ParticleSystem *psys, float dtime) +{ SPHFluidSettings *fluid = psys->part->fluid; ParticleData *pa1, *pa2; ParticleSpring *spring = psys->fluid_springs; @@ -2491,7 +2493,8 @@ static void sph_force_cb(void *sphdata_v, ParticleKey *state, float *force, floa madd_v3_v3fl(force, gravity, fluid->buoyancy * (pfr.density-rest_density)); } -static void sph_integrate(ParticleSimulationData *sim, ParticleData *pa, float dfra, float *gravity, EdgeHash *springhash, float *element_size, float flow[3]) { +static void sph_integrate(ParticleSimulationData *sim, ParticleData *pa, float dfra, float *gravity, EdgeHash *springhash, float *element_size, float flow[3]) +{ ParticleTarget *pt; int i; @@ -3294,7 +3297,8 @@ static void collision_fail(ParticleData *pa, ParticleCollision *col) * -uses Newton-Rhapson iteration to find the collisions * -handles spherical particles and (nearly) point like particles */ -static void collision_check(ParticleSimulationData *sim, int p, float dfra, float cfra){ +static void collision_check(ParticleSimulationData *sim, int p, float dfra, float cfra) +{ ParticleSettings *part = sim->psys->part; ParticleData *pa = sim->psys->particles + p; ParticleCollision col; @@ -3562,7 +3566,8 @@ static void hair_step(ParticleSimulationData *sim, float cfra) psys->flag |= PSYS_HAIR_UPDATED; } -static void save_hair(ParticleSimulationData *sim, float UNUSED(cfra)){ +static void save_hair(ParticleSimulationData *sim, float UNUSED(cfra)) +{ Object *ob = sim->ob; ParticleSystem *psys = sim->psys; HairKey *key, *root; @@ -4242,7 +4247,8 @@ void psys_check_boid_data(ParticleSystem *psys) } } -static void fluid_default_settings(ParticleSettings *part){ +static void fluid_default_settings(ParticleSettings *part) +{ SPHFluidSettings *fluid = part->fluid; fluid->spring_k = 0.f; |