diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-18 14:29:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-18 14:29:08 +0300 |
| commit | cd9e2a0c707130a64092583a27e8dfaf8c7cff7d (patch) | |
| tree | d2bbf270524c0a22695b209886bc39095257cd0b /source/blender/src/drawobject.c | |
| parent | 7643d5acd5020894875f204855e6c1c9b85ac384 (diff) | |
Bugfix for particle path drawing messing up opengl state in some cases.
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index c04561cc4b3..7b1d6403efa 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3426,12 +3426,12 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys) glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_NORMAL_ARRAY); glEnable(GL_LIGHTING); + + glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE); glEnable(GL_COLOR_MATERIAL); - if(part->draw&PART_DRAW_MAT_COL) { + if(part->draw&PART_DRAW_MAT_COL) glEnableClientState(GL_COLOR_ARRAY); - glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE); - } if(totchild && (part->draw&PART_DRAW_PARENT)==0) totpart=0; |