diff options
| author | Matt Ebb <matt@mke3.net> | 2008-02-12 02:24:16 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2008-02-12 02:24:16 +0300 |
| commit | 5c13a35d6369c3c70ecf913c3f2b93aaa01da2cc (patch) | |
| tree | d9eae6f304588155fac3ae6d968d80b3cb4a3682 /source/blender/src/drawobject.c | |
| parent | 798d8ebf26025aef0ddc155764429b86246573f5 (diff) | |
* Fix for crash, drawing particle systems with 'col' set to draw strands in material colour, but no material (null pointer).
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index e0bfa8d90d6..69d8d6a9417 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3046,7 +3046,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys) if(select) cpack(0xFFFFFF); - else if(part->draw&PART_DRAW_MAT_COL) + else if((ma) && (part->draw&PART_DRAW_MAT_COL)) glColor3f(ma->r,ma->g,ma->b); else cpack(0); |