[Bf-blender-cvs] [95d95ed] mathutils_bvhtree: Merge branch 'master' into mathutils_bvhtree

[Lukas Tönne]

Commit: 95d95edfa0bbada67a974546f0fd1544d6b3cd12
Author: Lukas Tönne
Date:   Wed Apr 29 09:11:36 2015 +0200
Branches: mathutils_bvhtree
https://developer.blender.org/rB95d95edfa0bbada67a974546f0fd1544d6b3cd12

Merge branch 'master' into mathutils_bvhtree

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



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

diff --cc source/blender/python/mathutils/CMakeLists.txt
index c744673,ef6b090..f70f893
--- a/source/blender/python/mathutils/CMakeLists.txt
+++ b/source/blender/python/mathutils/CMakeLists.txt
@@@ -38,8 -37,8 +38,9 @@@ set(SR
  	mathutils_Matrix.c
  	mathutils_Quaternion.c
  	mathutils_Vector.c
 +	mathutils_bvhtree.c
  	mathutils_geometry.c
+ 	mathutils_interpolate.c
  	mathutils_kdtree.c
  	mathutils_noise.c
  
@@@ -49,8 -48,8 +50,9 @@@
  	mathutils_Matrix.h
  	mathutils_Quaternion.h
  	mathutils_Vector.h
 +	mathutils_bvhtree.h
  	mathutils_geometry.h
+ 	mathutils_interpolate.h
  	mathutils_kdtree.h
  	mathutils_noise.h
  )
diff --cc source/blender/python/mathutils/mathutils.c
index 89f47ed,7b51b08..5e0def8
--- a/source/blender/python/mathutils/mathutils.c
+++ b/source/blender/python/mathutils/mathutils.c
@@@ -502,8 -585,8 +585,9 @@@ static struct PyModuleDef M_Mathutils_m
  
  /* submodules only */
  #include "mathutils_geometry.h"
+ #include "mathutils_interpolate.h"
  #ifndef MATH_STANDALONE
 +#  include "mathutils_bvhtree.h"
  #  include "mathutils_kdtree.h"
  #  include "mathutils_noise.h"
  #endif