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_hook.c | |
| parent | cc8672b95ec61c3292dc0f07620808a4b9b0a373 (diff) | |
| parent | 49fe27ee46b4d9272957c21c13365db322ca8396 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_hook.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_hook.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 7e7d43cdf20..ff2ed7108f2 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -65,13 +65,6 @@ static void copyData(ModifierData *md, ModifierData *target) HookModifierData *hmd = (HookModifierData *) md; HookModifierData *thmd = (HookModifierData *) target; - if (thmd->curfalloff != NULL) { - curvemapping_free(thmd->curfalloff); - } - if (thmd->indexar != NULL) { - MEM_freeN(thmd->indexar); - } - modifier_copyData_generic(md, target); thmd->curfalloff = curvemapping_copy(hmd->curfalloff); @@ -97,7 +90,7 @@ static void freeData(ModifierData *md) curvemapping_free(hmd->curfalloff); - if (hmd->indexar) MEM_freeN(hmd->indexar); + MEM_SAFE_FREE(hmd->indexar); } static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams)) |