Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-20 15:41:47 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-21 15:15:27 +0300
commit4494be513ac455b106b2cb9be119136a58212cd1 (patch)
tree3098b6ea0c06e38e0462dc49de211932ceb6916a /source/blender/modifiers
parentb7035cb8bd93d244b505264655310ef59ba0965b (diff)
Fix smoke to render in Cycles again.
Viewport caching seems still broken, though baking works.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_smoke.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c
index b91358a8ab6..d3fad2972c8 100644
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@ -72,12 +72,13 @@ static void initData(ModifierData *md)
smd->time = -1;
}
-static void copyData(const ModifierData *md, ModifierData *target, const int UNUSED(flag))
+static void copyData(const ModifierData *md, ModifierData *target, const int flag)
{
const SmokeModifierData *smd = (const SmokeModifierData *)md;
SmokeModifierData *tsmd = (SmokeModifierData *)target;
- smokeModifier_copy(smd, tsmd);
+ smokeModifier_free(tsmd);
+ smokeModifier_copy(smd, tsmd, flag);
}
static void freeData(ModifierData *md)