diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-12 19:29:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-12 19:29:05 +0300 |
| commit | e672a083d91ec7095cc6de4a55a8768772a19784 (patch) | |
| tree | e0a77b92cb395b0f72cfa6df7f2c811cb94b6945 /source/blender/blenkernel/intern/particle.c | |
| parent | 0a9321e532fd683bffd836451ce27a2b5da56ded (diff) | |
bugfix for particle editmode operators from (Janne Karhu)
psys_get_particle_on_path was taking dynamics into account, making subdivide add points in odd places.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 41ca5e1804a..169e39338bb 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3856,7 +3856,9 @@ void psys_get_particle_on_path(ParticleSimulationData *sim, int p, ParticleKey * pind.cache = cached ? psys->pointcache : NULL; pind.epoint = NULL; pind.bspline = (psys->part->flag & PART_HAIR_BSPLINE); - pind.dm = psys->hair_out_dm; + /* pind.dm disabled in editmode means we dont get effectors taken into + * account when subdividing for instance */ + pind.dm = psys_in_edit_mode(sim->scene, psys) ? NULL : psys->hair_out_dm; init_particle_interpolation(sim->ob, psys, pa, &pind); do_particle_interpolation(psys, p, pa, t, frs_sec, &pind, state); |