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_collision.c | |
parent | cc8672b95ec61c3292dc0f07620808a4b9b0a373 (diff) | |
parent | 49fe27ee46b4d9272957c21c13365db322ca8396 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index c8c00e31845..d80a2121db6 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -69,7 +69,7 @@ static void freeData(ModifierData *md) { CollisionModifierData *collmd = (CollisionModifierData *) md; - if (collmd) { + if (collmd) { /* Seriously? */ if (collmd->bvhtree) { BLI_bvhtree_free(collmd->bvhtree); collmd->bvhtree = NULL; |