diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-11 18:03:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-11 18:03:45 +0300 |
| commit | 65758a9a20807b3ee6ae470f76b4fe3d0cb382f6 (patch) | |
| tree | 7022ec918c5b62a31fbbe88143525515395272b7 /source/blender/blenkernel | |
| parent | d5edeb526cd980b9bccce5d174593c5306dada63 (diff) | |
Bugfixes for:
- Disabled particle modifiers in particle mode.
- Particle col option without material.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index c812c794682..639a9824600 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1730,7 +1730,7 @@ void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa, VECSUB((state-1)->vel,state->co,(state-2)->co); VecMulf((state-1)->vel,0.5); - if(part->draw & PART_DRAW_MAT_COL) + if(ctx->ma && (part->draw & PART_DRAW_MAT_COL)) get_strand_normal(ctx->ma, ornor, cur_length, (state-1)->vel); } @@ -1754,7 +1754,7 @@ void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa, cur_length= 0.0f; } - if(part->draw & PART_DRAW_MAT_COL) { + if(ctx->ma && (part->draw & PART_DRAW_MAT_COL)) { VECCOPY(state->col, &ctx->ma->r) get_strand_normal(ctx->ma, ornor, cur_length, state->vel); } @@ -1910,7 +1910,7 @@ void psys_cache_paths(Object *ob, ParticleSystem *psys, float cfra, int editupda psys->lattice = psys_get_lattice(ob, psys); ma= give_current_material(ob, psys->part->omat); - if(psys->part->draw & PART_DRAW_MAT_COL) + if(ma && (psys->part->draw & PART_DRAW_MAT_COL)) VECCOPY(col, &ma->r) /*---first main loop: create all actual particles' paths---*/ |