[Bf-blender-cvs] [6aabc1b] master: Cleanup; duplicate header

[Campbell Barton]

Commit: 6aabc1bde4ebb284a6b5c9bf1e936502b6fc1c07
Author: Campbell Barton
Date:   Thu Jul 23 15:39:36 2015 +1000
Branches: master
https://developer.blender.org/rB6aabc1bde4ebb284a6b5c9bf1e936502b6fc1c07

Cleanup; duplicate header

===================================================================

M	source/blender/blenkernel/BKE_bvhutils.h
M	source/blender/makesrna/intern/rna_nodetree.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index 52a659b..d8eaa35 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 7fc25f9..168b2ce 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"