From ee92957b363950f49a562632d42494cb35f0e8ed Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Mon, 3 Aug 2009 16:39:12 +0000 Subject: Smoke: fix crash with collisions + flows --- source/blender/makesdna/DNA_smoke_types.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/makesdna/DNA_smoke_types.h') diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index 0c93b5eb56e..c3efc5e04dd 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -75,10 +75,8 @@ typedef struct SmokeDomainSettings { int max_textures; short noise; /* noise type: wave, curl, anisotropic */ short pad2; - int prev_res[3]; - int prev_maxres; - int render_res[3]; - int render_maxres; + int pad; + int pad3; } SmokeDomainSettings; @@ -104,6 +102,7 @@ typedef struct SmokeFlowSettings { /* collision objects (filled with smoke) */ typedef struct SmokeCollSettings { struct SmokeModifierData *smd; /* for fast RNA access */ + struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */ float *points; float *points_old; float *vel; -- cgit v1.2.3