archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-04-21 16:30:24 +02:00
parent 111a53f74c 7e977470f3
commit cc2d501642
21 changed files with 338 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/mathutils/mathutils_Matrix.c
View File

@@ -1641,9 +1641,9 @@ static PyObject *Matrix_rotate(MatrixObject *self, PyObject *value)
PyDoc_STRVAR(Matrix_decompose_doc,
".. method:: decompose()\n"
"\n"
" Return the location, rotation and scale components of this matrix.\n"
" Return the translation, rotation and scale components of this matrix.\n"
"\n"
" :return: loc, rot, scale triple.\n"
" :return: trans, rot, scale triple.\n"
" :rtype: (:class:`Vector`, :class:`Quaternion`, :class:`Vector`)"
);
static PyObject *Matrix_decompose(MatrixObject *self)