diff options
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 3 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
4 files changed, 6 insertions, 7 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 */ diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 0ad36d31e8c..b72c40cc83d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2925,7 +2925,7 @@ static void direct_link_material(FileData *fd, Material *ma) /* ************ READ PARTICLE SETTINGS ***************** */ /* update this also to writefile.c */ -static char *ptcache_data_struct[] = { +static const char *ptcache_data_struct[] = { "", // BPHYS_DATA_INDEX "", // BPHYS_DATA_LOCATION "", // BPHYS_DATA_VELOCITY diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 0e6adf74cd3..c1e5eadee6a 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -770,7 +770,7 @@ static void write_boid_state(WriteData *wd, BoidState *state) } /* update this also to readfile.c */ -static char *ptcache_data_struct[] = { +static const char *ptcache_data_struct[] = { "", // BPHYS_DATA_INDEX "", // BPHYS_DATA_LOCATION "", // BPHYS_DATA_VELOCITY @@ -780,7 +780,7 @@ static char *ptcache_data_struct[] = { "", // BPHYS_DATA_TIMES: "BoidData" // case BPHYS_DATA_BOIDS: }; -static char *ptcache_extra_struct[] = { +static const char *ptcache_extra_struct[] = { "", "ParticleSpring" }; |