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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-05-08 15:22:46 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-05-08 15:22:46 +0300
commitb857b8f4c441ba40c7848f176ba750c4a4b093cb (patch)
treed30bae4794e659fccd1b2bd64e6b2cea2ded3048 /source/blender/modifiers/intern/MOD_ocean.c
parentcc8672b95ec61c3292dc0f07620808a4b9b0a373 (diff)
parent49fe27ee46b4d9272957c21c13365db322ca8396 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_ocean.c')
-rw-r--r--source/blender/modifiers/intern/MOD_ocean.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index bff12a55558..e589620b211 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -167,8 +167,6 @@ static void copyData(ModifierData *md, ModifierData *target)
#endif
OceanModifierData *tomd = (OceanModifierData *) target;
- freeData(target);
-
modifier_copyData_generic(md, target);
tomd->refresh = 0;