Merge branch 'master' into blender2.8

2016-12-01 10:29:46 +01:00
parent 73c1c92c0e 58877d6d08
commit ff2a74906a
123 changed files with 1709 additions and 827 deletions
--- a/source/blender/python/mathutils/mathutils_bvhtree.c
+++ b/source/blender/python/mathutils/mathutils_bvhtree.c
@@ -817,13 +817,14 @@ static PyObject *C_BVHTree_FromPolygons(PyObject *UNUSED(cls), PyObject *args, P
 					PyErr_Format(PyExc_ValueError,
 					             "%s: index %d must be less than %d",
 					             error_prefix, plink->poly[j], coords_len);
-
-					Py_DECREF(py_tricoords_fast);
+					/* decref below */
 					valid = false;
 					break;
 				}
 			}

+			Py_DECREF(py_tricoords_fast);
+
 			if (py_tricoords_len >= 3) {
 				tris_len += (py_tricoords_len - 2);
 			}