diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-23 08:39:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-23 08:40:47 +0300 |
| commit | 6aabc1bde4ebb284a6b5c9bf1e936502b6fc1c07 (patch) | |
| tree | 88683a7ebc8d2bc5e699b8b762dd9de330e0fb33 | |
| parent | 0a249f98534e20928d2d52c4585bff5d96ea9000 (diff) | |
Cleanup; duplicate header
| -rw-r--r-- | source/blender/blenkernel/BKE_bvhutils.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index 52a659bc0c2..d8eaa350e66 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -110,7 +110,7 @@ BVHTree *bvhtree_from_mesh_looptri_ex( struct BVHTreeFromMesh *data, const struct MVert *vert, const bool vert_allocated, const struct MLoop *mloop, const bool loop_allocated, - const struct MLoopTri *looptri, const int looptri_num, const bool face_allocated, + const struct MLoopTri *looptri, const int looptri_num, const bool looptri_allocated, BLI_bitmap *mask, int looptri_num_active, float epsilon, int tree_type, int axis); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 7fc25f9f06a..168b2ce05f6 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -39,7 +39,6 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" -#include "DNA_scene_types.h" #include "DNA_text_types.h" #include "DNA_texture_types.h" |