Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_collision.c
index ff0c650047915ded1823756f333de221048197f0..ef6b6e3de612f89c0af07f4ac38bb0b00f6a7d5b 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_object_force.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -45,7 +46,6 @@
 #include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"
 #include "BKE_modifier.h"
-#include "BKE_pointcache.h"
 #include "BKE_scene.h"
 
 static void initData(ModifierData *md)