diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-01 05:28:08 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-01 05:28:08 +0300 |
| commit | b5ba824cf28e61cea21042bf58ef628bef6a2d13 (patch) | |
| tree | cc7a17e96e682ec65aed291b8bff85b82c7f121a /source | |
| parent | 0184c62b632fcb3b7894fa9e161e9ab9206fe2a6 (diff) | |
patch from JacobF on IRC, copy smoke settings. double checked none of these are used for runtime.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 8fd9c48cc61..b449ebb89ac 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -773,6 +773,9 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData tsmd->domain->viewsettings = smd->domain->viewsettings; tsmd->domain->fluid_group = smd->domain->fluid_group; tsmd->domain->coll_group = smd->domain->coll_group; + tsmd->domain->vorticity = smd->domain->vorticity; + tsmd->domain->time_scale = smd->domain->time_scale; + tsmd->domain->border_collisions = smd->domain->border_collisions; MEM_freeN(tsmd->domain->effector_weights); tsmd->domain->effector_weights = MEM_dupallocN(smd->domain->effector_weights); @@ -781,6 +784,8 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData tsmd->flow->temp = smd->flow->temp; tsmd->flow->psys = smd->flow->psys; tsmd->flow->type = smd->flow->type; + tsmd->flow->flags = smd->flow->flags; + tsmd->flow->vel_multi = smd->flow->vel_multi; } else if (tsmd->coll) { ; /* leave it as initialised, collision settings is mostly caches */ |