diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2008-07-07 02:52:55 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2008-07-07 02:52:55 +0400 |
| commit | dd5148e265ac519776da5df78c6186eaefc7e7b8 (patch) | |
| tree | 5f02a25c8512448c3a99bf71d7555b99e7357565 /source/blender/blenkernel/intern/particle.c | |
| parent | a06a4663c4df9094acf5ab01e7407f379b137b51 (diff) | |
Fix for bug: [#14570] particle system: grid distribution + vertex emitting bug
- grid distribution didn't check for emission from vertices
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 18fca5439ef..24a3d348ae7 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1371,7 +1371,7 @@ void psys_particle_on_shape(int distr, int index, float *fuv, float *vec, float /************************************************/ void psys_particle_on_emitter(Object *ob, ParticleSystemModifierData *psmd, int from, int index, int index_dmcache, float *fuv, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor){ if(psmd){ - if(psmd->psys->part->distr==PART_DISTR_GRID){ + if(psmd->psys->part->distr==PART_DISTR_GRID && psmd->psys->part->from != PART_FROM_VERT){ if(vec){ VECCOPY(vec,fuv); } |