diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-11-26 01:13:40 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-11-26 01:13:40 +0300 |
| commit | 5d0b3a5230dd8ff10efcdec21931e1c6de88d700 (patch) | |
| tree | 79d147297b80e8b20708ca3ae36f422c416aaff4 /source/blender/blenkernel/intern/smoke.c | |
| parent | 2b4cf2ac8da8079edc297eb49e44cde3b0573085 (diff) | |
Smoke domain resolutions were calculated wrong for non-cube domains in some cases.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index ee19e779cc5..8822d0cb4c9 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -177,7 +177,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive if(size[0] > size[1]) { - if(size[0] > size[1]) + if(size[0] > size[2]) { scale = res / size[0]; smd->domain->dx = size[0] / res; @@ -187,11 +187,11 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive } else { - scale = res / size[1]; - smd->domain->dx = size[1] / res; - smd->domain->res[1] = res; + scale = res / size[2]; + smd->domain->dx = size[2] / res; + smd->domain->res[2] = res; smd->domain->res[0] = (int)(size[0] * scale + 0.5); - smd->domain->res[2] = (int)(size[2] * scale + 0.5); + smd->domain->res[1] = (int)(size[1] * scale + 0.5); } } else |