Merge branch 'master' into blender28

2017-10-06 21:25:33 +11:00
parent d7d32ad452 3df139c530
commit ea606a7847
102 changed files with 1652 additions and 1253 deletions
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -806,7 +806,7 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject
 			             "`GL_TYPE` and `typestr` of object with buffer interface do not match. '%s'", pybuffer.format);
 		}
 		else if (ndimensions != pybuffer.ndim ||
-		        !compare_dimensions(ndimensions, dimensions, pybuffer.shape))
+		         !compare_dimensions(ndimensions, dimensions, pybuffer.shape))
 		{
 			PyErr_Format(PyExc_TypeError, "array size does not match");
 		}