diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-01-29 19:42:57 +0300 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-01-29 19:42:57 +0300 |
commit | 2f4ca518ea468f6c2e06a70aa24f16cf8a141425 (patch) | |
tree | 345202ea0fdd63429f4207003ef44aeebe8578ac /source/blender/src/drawobject.c | |
parent | 5da7f4df472f41997a1f424315f94d0d04b3dd30 (diff) | |
parent | fd9db17021064552cdecbcfadce4255257d71e17 (diff) |
svn merge -r 13415:13452 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/src/drawobject.c')
-rw-r--r-- | source/blender/src/drawobject.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 6696fd3cfe3..349432d87a1 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3814,7 +3814,9 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys) glDisable(GL_LIGHTING); glDisableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_NORMAL_ARRAY); +#if 0 /* If this is needed, it cant be enabled in wire mode, since it messes up the view - Campbell */ glEnable(GL_DEPTH_TEST); +#endif if(states) MEM_freeN(states); |