diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-02-14 15:34:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-14 15:34:54 +0300 |
| commit | 4eb064a00129646ab04e6d95fd18233358e963d3 (patch) | |
| tree | b263b16babbd9712250a07f2c78cd163dff3463f /source/blender/src/drawobject.c | |
| parent | 139b612b09616cc1a7558f8f60b05ef6ee97580f (diff) | |
Object drawing was setting switching glDepthMask(GL_FALSE); even when no particles were drawn.
Added an annoying message when people press the F key to say FaceSel mode was removed.
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 69d8d6a9417..36e9f6ea9e8 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -5103,23 +5103,25 @@ 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 && ob!=G.obedit){ - glDepthMask(GL_FALSE); + if( (warning_recursive==0) && + (ob->particlesystem.first) && + (flag & DRAW_PICKING)==0 && + (ob!=G.obedit) + ) { + ParticleSystem *psys; if(col || (ob->flag & SELECT)) cpack(0xFFFFFF); /* for visibility, also while wpaint */ - if(ob->particlesystem.first) { - ParticleSystem *psys; - - for(psys=ob->particlesystem.first; psys; psys=psys->next) - draw_new_particle_system(base, psys); - - if(G.f & G_PARTICLEEDIT && ob==OBACT) { - psys= PE_get_current(ob); - if(psys && !G.obedit && psys_in_edit_mode(psys)) - draw_particle_edit(ob, psys); - } + glDepthMask(GL_FALSE); + + for(psys=ob->particlesystem.first; psys; psys=psys->next) + draw_new_particle_system(base, psys); + + if(G.f & G_PARTICLEEDIT && ob==OBACT) { + psys= PE_get_current(ob); + if(psys && !G.obedit && psys_in_edit_mode(psys)) + draw_particle_edit(ob, psys); } - if(col) cpack(col); glDepthMask(GL_TRUE); + if(col) cpack(col); } { |