diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
| commit | 53a56b7b6c169b21df475ae94795208501581489 (patch) | |
| tree | 011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_collision.c | |
| parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
| parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_collision.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index d80a2121db6..6ec1f4d8e5c 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -81,10 +81,7 @@ static void freeData(ModifierData *md) MEM_SAFE_FREE(collmd->current_xnew); MEM_SAFE_FREE(collmd->current_v); - if (collmd->tri) { - MEM_freeN((void *)collmd->tri); - collmd->tri = NULL; - } + MEM_SAFE_FREE(collmd->tri); collmd->time_x = collmd->time_xnew = -1000; collmd->mvert_num = 0; |