diff options
author | Janne Karhu <jhkarh@gmail.com> | 2011-01-10 05:40:24 +0300 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2011-01-10 05:40:24 +0300 |
commit | d9c6f51ee25e4c3d56a9e06fb8e544f230174744 (patch) | |
tree | 9368fbf812fd9428850988b405786d51d2e8b49a /source/blender/blenkernel | |
parent | 83806d40429f3c847a3265cdb1cfe20bf6b08c3d (diff) |
Compiler warning fixes for the same point cache things Joshua tried to fix earlier, don't know why I didn't notice these before.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_pointcache.h | 22 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 7 |
2 files changed, 6 insertions, 23 deletions
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index a4ce46409a1..c8e967e8a9a 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -32,7 +32,6 @@ #include "DNA_ID.h" #include "DNA_object_force.h" #include "DNA_boid_types.h" -#include "DNA_particle_types.h" #include <stdio.h> /* for FILE */ /* Point cache clearing option, for BKE_ptcache_id_clear, before @@ -100,27 +99,6 @@ typedef struct PTCacheData { struct BoidData boids; } PTCacheData; -static char *ptcache_datastruct[] = { - "", // BPHYS_DATA_INDEX - "", // BPHYS_DATA_LOCATION - "", // BPHYS_DATA_VELOCITY - "", // BPHYS_DATA_ROTATION - "", // BPHYS_DATA_AVELOCITY / BPHYS_DATA_XCONST */ - "", // BPHYS_DATA_SIZE: - "", // BPHYS_DATA_TIMES: - "BoidData" // case BPHYS_DATA_BOIDS: -}; - -static char *ptcache_extra_datastruct[] = { - "", - "ParticleSpring" -}; - -static int ptcache_extra_datasize[] = { - 0, - sizeof(ParticleSpring) -}; - typedef struct PTCacheFile { FILE *fp; diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index c4f1690e474..6b3584c1832 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -97,7 +97,7 @@ /* could be made into a pointcache option */ #define DURIAN_POINTCACHE_LIB_OK 1 -int ptcache_data_size[] = { +static int ptcache_data_size[] = { sizeof(unsigned int), // BPHYS_DATA_INDEX 3 * sizeof(float), // BPHYS_DATA_LOCATION 3 * sizeof(float), // BPHYS_DATA_VELOCITY @@ -108,6 +108,11 @@ int ptcache_data_size[] = { sizeof(BoidData) // case BPHYS_DATA_BOIDS }; +static int ptcache_extra_datasize[] = { + 0, + sizeof(ParticleSpring) +}; + /* forward declerations */ static int ptcache_file_compressed_read(PTCacheFile *pf, unsigned char *result, unsigned int len); static int ptcache_file_compressed_write(PTCacheFile *pf, unsigned char *in, unsigned int in_len, unsigned char *out, int mode); |