griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

callback function ptcache_particle_extra_read() was incorrect type, also fix some other compiler warnings with recent commits.

Browse Source
This commit is contained in:
Campbell Barton
2011-01-10 05:17:53 +00:00
parent ede0d85522
commit 5feb46d814
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/particle_system.c
View File

@@ -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 {

3
source/blender/blenkernel/intern/pointcache.c
View File

@@ -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 */

2
source/blender/blenloader/intern/readfile.c
View File

@@ -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

4
source/blender/blenloader/intern/writefile.c
View File

@@ -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"
};