From 112711e6a45a8e556bbd3e705ef6313a5b2ddc01 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Tue, 27 Jul 2010 16:18:12 +0000 Subject: Smoke: - Bugfix for using uninitalised velocity in case of PART_PHYS_NO (reported by MiikaH) --- source/blender/blenkernel/intern/smoke.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/smoke.c') 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; - } -- cgit v1.2.3