Merge branch 'master' into blender2.8

2017-08-12 14:06:02 +10:00
parent 9567529b8f ccb8e78d6c
commit a60727080f
27 changed files with 60 additions and 184 deletions
--- a/source/blender/python/mathutils/mathutils_bvhtree.c
+++ b/source/blender/python/mathutils/mathutils_bvhtree.c
@@ -1163,7 +1163,6 @@ static PyObject *C_BVHTree_FromObject(PyObject *UNUSED(cls), PyObject *args, PyO

 	/* Get data for tessellation */
 	{
-		DM_ensure_looptri(dm);
 		lt = dm->getLoopTriArray(dm);

 		tris_len = (unsigned int)dm->getNumLoopTri(dm);