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_surfacedeform.c | |
parent | cc8672b95ec61c3292dc0f07620808a4b9b0a373 (diff) | |
parent | 49fe27ee46b4d9272957c21c13365db322ca8396 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_surfacedeform.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_surfacedeform.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index bedce88326e..f262fa99db1 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -124,12 +124,11 @@ static void freeData(ModifierData *md) MEM_SAFE_FREE(smd->verts[i].binds[j].vert_weights); } - MEM_freeN(smd->verts[i].binds); + MEM_SAFE_FREE(smd->verts[i].binds); } } - MEM_freeN(smd->verts); - smd->verts = NULL; + MEM_SAFE_FREE(smd->verts); } } @@ -138,8 +137,6 @@ static void copyData(ModifierData *md, ModifierData *target) SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md; SurfaceDeformModifierData *tsmd = (SurfaceDeformModifierData *)target; - freeData(target); - modifier_copyData_generic(md, target); if (smd->verts) { |