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/drawobject.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/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 737b118a40b..52a8f9a34ef 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -5038,7 +5038,7 @@ void draw_object(Base *base, int flag) if(ob->pd && ob->pd->forcefield) draw_forcefield(ob); /* code for new particle system */ - if(warning_recursive==0 && (flag & DRAW_PICKING)==0){ + if(warning_recursive==0 && (flag & DRAW_PICKING)==0 && ob!=G.obedit){ glDepthMask(GL_FALSE); if(col || (ob->flag & SELECT)) cpack(0xFFFFFF); /* for visibility, also while wpaint */ if(ob->particlesystem.first) { |