diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-01-18 02:38:53 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-01-18 02:38:53 +0300 |
| commit | 0db1666b6e178d9d4fe948f591666c5d094a8213 (patch) | |
| tree | af9782341790592d3ee86673588c288b3e4e08c3 /source/blender/blenkernel/intern/particle.c | |
| parent | 44c31bb04523799bf918bb4e519c0ebad4c0b9b1 (diff) | |
Routine purge of compiler warnings
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 9a429b0be6e..bf8d1e9d8aa 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2240,7 +2240,7 @@ void psys_cache_paths(Object *ob, ParticleSystem *psys, float cfra, int editupda Material *ma; float birthtime = 0.0, dietime = 0.0; - float t, time, keytime, dfra = 1.0, frs_sec = G.scene->r.frs_sec; + float t, time = 0.0, keytime = 0.0, dfra = 1.0, frs_sec = G.scene->r.frs_sec; float col[3] = {0.5f, 0.5f, 0.5f}; float prev_tangent[3], hairmat[4][4]; int k,i; @@ -3235,13 +3235,13 @@ void psys_get_particle_on_path(Object *ob, ParticleSystem *psys, int p, Particle ParticleData *pa; ChildParticle *cpa; ParticleTexture ptex; - ParticleKey tstate, *kkey[2] = {NULL, NULL}; + ParticleKey *kkey[2] = {NULL, NULL}; HairKey *hkey[2]; ParticleKey *par=0, keys[4]; float t, real_t, dfra, keytime, frs_sec = G.scene->r.frs_sec; float co[3], orco[3]; - float imat[4][4], hairmat[4][4], cpa_1st[3]; + float hairmat[4][4]; float pa_clump = 0.0, pa_kink = 0.0; int totparent = 0; int totpart = psys->totpart; |