diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-10 08:17:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-10 08:17:53 +0300 |
| commit | 5feb46d8146f7f00fca02d575e489ec880ca15e0 (patch) | |
| tree | 8ca7e85990dc549638329a84efa895942adc0bd3 /source/blender/blenkernel | |
| parent | ede0d855229713ee383d114cf3c6fecc4ff30464 (diff) | |
callback function ptcache_particle_extra_read() was incorrect type, also fix some other compiler warnings with recent commits.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 3 |
2 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 fac79270bc1..4cfcad4dbb6 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2415,7 +2415,7 @@ static void apply_particle_fluidsim(Object *ob, ParticleSystem *psys, ParticleDa /*----------------------------------------------------------------*/ } -static void apply_fluid_springs(ParticleSystem *psys, ParticleSettings *part, float timestep){ +static void apply_fluid_springs(ParticleSystem *psys, float timestep){ SPHFluidSettings *fluid = psys->part->fluid; ParticleData *pa1, *pa2; ParticleSpring *spring = psys->fluid_springs; @@ -3563,7 +3563,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) } /* Apply springs to particles */ - apply_fluid_springs(psys, part, timestep); + apply_fluid_springs(psys, timestep); /* apply velocity, collisions and rotation */ LOOP_DYNAMIC_PARTICLES { diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 6b3584c1832..37ce6c94eb7 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -416,7 +416,7 @@ static void ptcache_particle_extra_write(void *psys_v, PTCacheMem *pm, int UNUSE } } -static int ptcache_particle_extra_read(void *psys_v, PTCacheMem *pm, float UNUSED(cfra)) +static void ptcache_particle_extra_read(void *psys_v, PTCacheMem *pm, float UNUSED(cfra)) { ParticleSystem *psys = psys_v; PTCacheExtra *extra = pm->extradata.first; @@ -434,7 +434,6 @@ static int ptcache_particle_extra_read(void *psys_v, PTCacheMem *pm, float UNUSE } } } - return 1; } /* Cloth functions */ |