diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-12-15 02:47:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-12-15 04:34:14 +0300 |
commit | 525364be31aafa547f4b17b9947074ed5a5b2570 (patch) | |
tree | 1826a3cb8ae72f0f2c936c419366323c88b21215 /source/blender/blenkernel/BKE_collision.h | |
parent | 15f2f69694cb23d04989d3faea4853468a3b140a (diff) |
Cleanup: reduce indirect DNA header inclusion
Remove DNA headers, using forward declarations where possible.
Also removed duplicate header, header including it's self
and unnecessary inclusion of libc system headers from BKE header.
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
-rw-r--r-- | source/blender/blenkernel/BKE_collision.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 3a5328a33e2..a10a4e3c7fd 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -22,23 +22,13 @@ * \ingroup bke */ -#include <float.h> -#include <math.h> -#include <stdlib.h> -#include <string.h> - -/* types */ -#include "BKE_collision.h" -#include "DNA_cloth_types.h" - -#include "BLI_kdopbvh.h" - #ifdef __cplusplus extern "C" { #endif struct Collection; struct CollisionModifierData; +struct BVHTree; struct Depsgraph; struct MVert; struct MVertTri; @@ -113,11 +103,11 @@ typedef struct FaceCollPair { // used in modifier.c from collision.c ///////////////////////////////////////////////// -BVHTree *bvhtree_build_from_mvert(const struct MVert *mvert, - const struct MVertTri *tri, - int tri_num, - float epsilon); -void bvhtree_update_from_mvert(BVHTree *bvhtree, +struct BVHTree *bvhtree_build_from_mvert(const struct MVert *mvert, + const struct MVertTri *tri, + int tri_num, + float epsilon); +void bvhtree_update_from_mvert(struct BVHTree *bvhtree, const struct MVert *mvert, const struct MVert *mvert_moving, const struct MVertTri *tri, |