diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-18 13:49:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-18 13:49:46 +0300 |
| commit | 785b4dcdda5f03c81395cd1862bd7d550621ba46 (patch) | |
| tree | e096852f8ca9ee8cde0dd76a4215be5b34503f96 /source/blender/blenkernel/BKE_particle.h | |
| parent | 0fe6abbfa3d8d089ec8397b7a8166cd41eada612 (diff) | |
Fix for bug #8052: particle emit from verts and volume didn't support
subsurf/derivedmesh mapping yet.
Also added int-to-pointer and back conversion function to solve warnings.
Note that it is only allowed to store an int in a pointer and then get
it back, but not a pointer in an int!
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index df0a459e496..85fa079cef4 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -295,7 +295,7 @@ void reset_particle(struct ParticleData *pa, struct ParticleSystem *psys, struct void do_effectors(int pa_no, struct ParticleData *pa, struct ParticleKey *state, struct Object *ob, struct ParticleSystem *psys, float *force_field, float *vel,float framestep, float cfra); -void psys_calc_dmfaces(struct Object *ob, struct DerivedMesh *dm, struct ParticleSystem *psys); +void psys_calc_dmcache(struct Object *ob, struct DerivedMesh *dm, struct ParticleSystem *psys); int psys_particle_dm_face_lookup(struct Object *ob, struct DerivedMesh *dm, int index, float *fw, struct LinkNode *node); /* ParticleEffectorCache->type */ |