diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-06 20:01:31 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-06 20:01:31 +0400 |
| commit | 7fbf8080e6d1b3c4a93b7ab2b6026c4e1720ad95 (patch) | |
| tree | a22bbd3ac7c49f47d996c51b3e6415ff390ede1a /source/blender/src/drawobject.c | |
| parent | 70f7b998fccc2fa92a4ec65834c749447c9c4a16 (diff) | |
| parent | 722f24d15357275ee3efed33fa03f9b27909a604 (diff) | |
Apricot Branch
==============
svn merge -r 14688:14706
Also, use vertex arrays for drawing points, and a temporary hack to
reduce the number of points.
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index af3996b4829..e9a6395579e 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -2588,7 +2588,7 @@ static int draw_mesh_object(Base *base, int dt, int flag) } /* init_gl_materials did the proper checking if this is needed */ - if(has_alpha) add_view3d_after(G.vd, base, V3D_TRANSP); + if(has_alpha) add_view3d_after(G.vd, base, V3D_TRANSP, flag); return retval; } @@ -4783,7 +4783,7 @@ void draw_object(Base *base, int flag) 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); + add_view3d_after(G.vd, base, V3D_XRAY, flag); return; } } |