diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2010-07-27 20:18:12 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2010-07-27 20:18:12 +0400 |
| commit | 112711e6a45a8e556bbd3e705ef6313a5b2ddc01 (patch) | |
| tree | e70dbb15d6141e72616a2d0a0ef2a4883458daaa /source/blender/blenkernel/intern/smoke.c | |
| parent | 88dcfbaee9be4a08104efc2f4edd20dd8e7957fe (diff) | |
Smoke:
- Bugfix for using uninitalised velocity in case of PART_PHYS_NO (reported by MiikaH)
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index b106c557b92..2664a20bd18 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -937,12 +937,11 @@ static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd) // Uses particle velocity as initial velocity for smoke - if(sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY) { - + if(sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY && (psys->part->phystype != PART_PHYS_NO)) + { velocity_x[index] = pa->state.vel[0]*sfs->vel_multi; velocity_y[index] = pa->state.vel[1]*sfs->vel_multi; velocity_z[index] = pa->state.vel[2]*sfs->vel_multi; - } |