diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-06 20:43:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-06 20:43:47 +0300 |
| commit | 51322964f4e00891621e249e5bd15e93a2d2ee06 (patch) | |
| tree | db080b5b4260a6d898ee609a313a29a321d2e5ce /source/blender/src/drawobject.c | |
| parent | ff52c8f2d6dbafc6b25879efdc47bfc4b99cf8f7 (diff) | |
Particles
=========
- Normalize strand coordinates over the length of the strand, not
cut off when with e.g. length texture control.
- Weight paint and particle mode x-mirror now works with deformation
and shape keys active.
- X-ray is now disabled in particle mode, messed up depth tests.
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index a73c4e71a3d..c77a74abe97 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -4706,10 +4706,13 @@ void draw_object(Base *base, int flag) /* xray delay? */ if((flag & DRAW_PICKING)==0 && (base->flag & OB_FROMDUPLI)==0) { - /* xray and transp are set when it is drawing the 2nd/3rd pass */ - if(!G.vd->xray && !G.vd->transp && (ob->dtx & OB_DRAWXRAY)) { - add_view3d_after(G.vd, base, V3D_XRAY); - return; + /* don't do xray in particle mode, need the z-buffer */ + if(!(G.f & G_PARTICLEEDIT)) { + /* xray and transp are set when it is drawing the 2nd/3rd pass */ + if(!G.vd->xray && !G.vd->transp && (ob->dtx & OB_DRAWXRAY)) { + add_view3d_after(G.vd, base, V3D_XRAY); + return; + } } } |