Merge branch 'master' into blender2.8

2018-06-04 09:06:14 +02:00
parent f6743fcaa4 2d3d76693a
commit 5b64301834
60 changed files with 422 additions and 419 deletions
--- a/source/blender/python/generic/blf_py_api.c
+++ b/source/blender/python/generic/blf_py_api.c
@@ -307,7 +307,7 @@ static PyObject *py_blf_rotation(PyObject *UNUSED(self), PyObject *args)

 	if (!PyArg_ParseTuple(args, "if:blf.rotation", &fontid, &angle))
 		return NULL;
-		
+
 	BLF_rotation(fontid, angle);

 	Py_RETURN_NONE;