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:
authorJulian Eisel <eiseljulian@gmail.com>2017-05-05 13:44:52 +0300
committerJulian Eisel <eiseljulian@gmail.com>2017-05-05 13:44:52 +0300
commit8b8792e7b8aa04c33d2b57c79a6d24bf03b699fb (patch)
tree575027326d925d9e2028ce7c24f384d48a0bd067 /source/blender/modifiers
parenta7388d650a8b0045aee680ca38cc02fc021ebbc3 (diff)
parent5b6838129f022102518b7cd8cabec3823c3749a8 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_warp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c
index 9abe768726e..c9a9e20df23 100644
--- a/source/blender/modifiers/intern/MOD_warp.c
+++ b/source/blender/modifiers/intern/MOD_warp.c
@@ -64,6 +64,10 @@ static void copyData(ModifierData *md, ModifierData *target)
WarpModifierData *wmd = (WarpModifierData *) md;
WarpModifierData *twmd = (WarpModifierData *) target;
+ if (twmd->curfalloff != NULL) {
+ curvemapping_free(twmd->curfalloff);
+ }
+
modifier_copyData_generic(md, target);
twmd->curfalloff = curvemapping_copy(wmd->curfalloff);