diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-01 03:38:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-01 03:38:36 +0300 |
commit | 8ddaa6a4e237cfa667ace4a00f147e2683d83840 (patch) | |
tree | 96c6e1b8ca4051317b42a3b77269c61c45af8f66 /source/blender/modifiers/intern/MOD_collision.c | |
parent | b71366801e45dafd7fb8c658edeaf88dfb4cb84e (diff) | |
parent | a372638a76e05aaa44589845680c15a7f09a7f1e (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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 9383c451112..0e0e93fc727 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -40,7 +40,6 @@ #include "BLI_math.h" #include "BLI_utildefines.h" - #include "BKE_collision.h" #include "BKE_cdderivedmesh.h" #include "BKE_global.h" @@ -48,6 +47,8 @@ #include "BKE_pointcache.h" #include "BKE_scene.h" +#include "MOD_modifiertypes.h" + static void initData(ModifierData *md) { CollisionModifierData *collmd = (CollisionModifierData *) md; |