diff options
| author | Matt Ebb <matt@mke3.net> | 2010-05-14 11:09:15 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-05-14 11:09:15 +0400 |
| commit | 279885290367b8ddb7570452b664ce4df796c192 (patch) | |
| tree | 5d30fe8c43f7f336557f07bf3f2b8c9727e668c4 /source/blender/modifiers/intern/MOD_smoke.c | |
| parent | d8856352164d1118f46eae59a60bf1c0abb36516 (diff) | |
Fix:
[#22310] Duplicate Does Not Propogate SimpleDeform's VGroup
[#22321] duplicating object with smoke settings doesnt duplicate smoke settings
^ Genscher, you may want to check that but I thought it was pretty straightforward.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_smoke.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_smoke.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 32d908a5552..df8372876bd 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -32,6 +32,8 @@ #include "stddef.h" +#include "MEM_guardedalloc.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" #include "BKE_smoke.h" @@ -52,6 +54,14 @@ static void initData(ModifierData *md) smd->time = -1; } +static void copyData(ModifierData *md, ModifierData *target) +{ + SmokeModifierData *smd = (SmokeModifierData*)md; + SmokeModifierData *tsmd = (SmokeModifierData*)target; + + smokeModifier_copy(smd, tsmd); +} + static void freeData(ModifierData *md) { SmokeModifierData *smd = (SmokeModifierData*) md; @@ -117,7 +127,7 @@ ModifierTypeInfo modifierType_Smoke = { | eModifierTypeFlag_UsesPointCache | eModifierTypeFlag_Single, - /* copyData */ 0, + /* copyData */ copyData, /* deformVerts */ deformVerts, /* deformVertsEM */ 0, /* deformMatricesEM */ 0, |