Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-01-10 08:17:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-01-10 08:17:53 +0300
commit5feb46d8146f7f00fca02d575e489ec880ca15e0 (patch)
tree8ca7e85990dc549638329a84efa895942adc0bd3 /source/blender/blenkernel/intern/pointcache.c
parentede0d855229713ee383d114cf3c6fecc4ff30464 (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/intern/pointcache.c')
-rw-r--r--source/blender/blenkernel/intern/pointcache.c3
1 files changed, 1 insertions, 2 deletions
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 */