diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 14:17:52 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 14:17:52 +0300 |
commit | 01e2395e057b6fd4c601312bb2feb8bd2888692b (patch) | |
tree | 70f6692816acf4ce8fae210a9136274393c49e4b /source/blender/src/editparticle.c | |
parent | e39b5f790d806258c26827fad18f40b5815f6b3b (diff) |
Particles
=========
- Fix for bug #7840: adding particle system to nurbs, curves crashes.
Now simply doesn't allow to add a particle system to a non-mesh
object, the current code does not support it.
- Fix for bug #7834: deleting vertices of an object with a particle
system crashes. Fixed by disabling particle display for objects in
editmode.
- Fix for the particle add brush on subsurfed objects.
Diffstat (limited to 'source/blender/src/editparticle.c')
-rw-r--r-- | source/blender/src/editparticle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/editparticle.c b/source/blender/src/editparticle.c index cdd122a9ae1..08f90e31f67 100644 --- a/source/blender/src/editparticle.c +++ b/source/blender/src/editparticle.c @@ -2134,7 +2134,7 @@ static void brush_add(Object *ob, ParticleSystem *psys, short *mval, short numbe /* warning, returns the derived mesh face */ #if EXPERIMENTAL_DEFORM_ONLY_PAINTING if(psys_intersect_dm(ob,dm,0,co1,co2,&min_d,&add_pars[n].num,add_pars[n].fuv,0,0,0,0)) { - add_pars[n].num_dmcache= psys_particle_dm_face_lookup(ob,dm,add_pars[n].num,add_pars[n].fuv,NULL); + add_pars[n].num_dmcache= psys_particle_dm_face_lookup(ob,psmd->dm,add_pars[n].num,add_pars[n].fuv,NULL); n++; } #else |