diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-18 01:42:03 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-18 01:42:03 +0300 |
| commit | 10529ca7437b64407774d44c79ff8ef52de399f0 (patch) | |
| tree | 1e7cf9808552043fda5d98e36ba8a4da7745063e /source/blender/src/drawobject.c | |
| parent | 83ddab60b72b693faa77068d77eb35f5555b81d2 (diff) | |
Fix for bug #8044: vertex colors weren't supported for hair.
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 36e9f6ea9e8..c04561cc4b3 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3426,11 +3426,11 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys) glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_NORMAL_ARRAY); glEnable(GL_LIGHTING); + glEnable(GL_COLOR_MATERIAL); if(part->draw&PART_DRAW_MAT_COL) { glEnableClientState(GL_COLOR_ARRAY); glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE); - glEnable(GL_COLOR_MATERIAL); } if(totchild && (part->draw&PART_DRAW_PARENT)==0) @@ -3456,10 +3456,9 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys) glDrawArrays(GL_LINE_STRIP, 0, path->steps + 1); } - if(part->draw&PART_DRAW_MAT_COL) { + if(part->draw&PART_DRAW_MAT_COL) glDisable(GL_COLOR_ARRAY); - glDisable(GL_COLOR_MATERIAL); - } + glDisable(GL_COLOR_MATERIAL); if(cdata2) MEM_freeN(cdata2); |