diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 15:21:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 15:22:14 +0300 |
| commit | 49fe27ee46b4d9272957c21c13365db322ca8396 (patch) | |
| tree | 235ed597431d68a62b3d7ac4f77c6599ccd09ba7 /source/blender/modifiers/intern/MOD_hook.c | |
| parent | 53580265118236a096257b50f29d354243bdefe3 (diff) | |
Modifiers: sanitize/cleanup modifiers' copying & freeing code.
Should also fix T55000: Crash with hooks and curves in Cycles render.
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 80c029157f7..80f07f579cd 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -67,13 +67,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); @@ -99,7 +92,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)) |