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/blenloader/intern/readfile.c | |
| 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/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a86363cf7ad..0ad36d31e8c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2924,7 +2924,17 @@ static void direct_link_material(FileData *fd, Material *ma) } /* ************ READ PARTICLE SETTINGS ***************** */ - +/* update this also to writefile.c */ +static char *ptcache_data_struct[] = { + "", // 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 void direct_link_pointcache(FileData *fd, PointCache *cache) { if((cache->flag & PTCACHE_DISK_CACHE)==0) { @@ -2941,7 +2951,7 @@ static void direct_link_pointcache(FileData *fd, PointCache *cache) pm->data[i] = newdataadr(fd, pm->data[i]); /* the cache saves non-struct data without DNA */ - if(pm->data[i] && strcmp(ptcache_datastruct[i], "")==0 && (fd->flags & FD_FLAGS_SWITCH_ENDIAN)) { + if(pm->data[i] && strcmp(ptcache_data_struct[i], "")==0 && (fd->flags & FD_FLAGS_SWITCH_ENDIAN)) { int j, tot= (BKE_ptcache_data_size (i) * pm->totpoint)/4; /* data_size returns bytes */ int *poin= pm->data[i]; |