diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 15:22:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 15:22:46 +0300 |
| commit | b857b8f4c441ba40c7848f176ba750c4a4b093cb (patch) | |
| tree | d30bae4794e659fccd1b2bd64e6b2cea2ded3048 /source/blender/modifiers/intern/MOD_fluidsim.c | |
| parent | cc8672b95ec61c3292dc0f07620808a4b9b0a373 (diff) | |
| parent | 49fe27ee46b4d9272957c21c13365db322ca8396 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_fluidsim.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 7014861bc12..90cd8a58cb1 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -70,14 +70,17 @@ static void copyData(ModifierData *md, ModifierData *target) FluidsimModifierData *fluidmd = (FluidsimModifierData *) md; FluidsimModifierData *tfluidmd = (FluidsimModifierData *) target; - fluidsim_free(tfluidmd); - if (fluidmd->fss) { tfluidmd->fss = MEM_dupallocN(fluidmd->fss); if (tfluidmd->fss && (tfluidmd->fss->meshVelocities != NULL)) { tfluidmd->fss->meshVelocities = MEM_dupallocN(tfluidmd->fss->meshVelocities); } } + + /* Seems to never be used, but for sqke of consistency... */ + BLI_assert(fluidmd->point_cache == NULL); + BLI_assert(tfluidmd->point_cache == NULL); + tfluidmd->point_cache = NULL; } |