From f1c69e9d84a4635f868b15150923b3522836c20a Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Mon, 10 Aug 2009 14:09:56 +0000 Subject: Smoke: * bugfix for crash when loading smoke files more once on linux/mac * could also fix occasional explosions * code cleanup --- source/blender/blenkernel/BKE_smoke.h | 2 +- source/blender/blenkernel/intern/smoke.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_smoke.h b/source/blender/blenkernel/BKE_smoke.h index b1b42286788..8dc38640e9a 100644 --- a/source/blender/blenkernel/BKE_smoke.h +++ b/source/blender/blenkernel/BKE_smoke.h @@ -1,5 +1,5 @@ /** - * BKE_cloth.h + * BKE_smoke.h * * $Id$ * diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index f053c55cf10..68d055f9eda 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1,5 +1,5 @@ /** - * BKE_cloth.h + * smoke.c * * $Id$ * @@ -207,7 +207,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive // printf("res[0]: %d, res[1]: %d, res[2]: %d\n", smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]); // dt max is 0.1 - smd->domain->fluid = smoke_init(smd->domain->res, 0, smd->domain->p0, smd->domain->p1, 2.5 / FPS); + smd->domain->fluid = smoke_init(smd->domain->res, smd->domain->p0, 2.5 / FPS); smd->domain->wt = smoke_turbulence_init(smd->domain->res, (smd->domain->flags & MOD_SMOKE_HIGHRES) ? (smd->domain->amplify + 1) : 0, smd->domain->noise); smd->time = scene->r.cfra; smd->domain->firstframe = smd->time; -- cgit v1.2.3