diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-10 08:17:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-10 08:17:53 +0300 |
| commit | 5feb46d8146f7f00fca02d575e489ec880ca15e0 (patch) | |
| tree | 8ca7e85990dc549638329a84efa895942adc0bd3 /source/blender/blenloader | |
| parent | ede0d855229713ee383d114cf3c6fecc4ff30464 (diff) | |
callback function ptcache_particle_extra_read() was incorrect type, also fix some other compiler warnings with recent commits.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
2 files changed, 3 insertions, 3 deletions
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" }; |