Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/collision.c

source/blender/python/mathutils/mathutils.c

@@ -405,7 +405,7 @@ int EXPP_VectorsAreEqual(const float *vecA, const float *vecB, int size, int flo
 }
 
 #ifndef MATH_STANDALONE
-/* dynstr as python string utility funcions, frees 'ds'! */
+/* dynstr as python string utility functions, frees 'ds'! */
 PyObject *mathutils_dynstr_to_py(struct DynStr *ds)
 {
 	const int ds_len = BLI_dynstr_get_len(ds); /* space for \0 */

source/blender/python/mathutils/mathutils.h

@@ -170,7 +170,7 @@ Py_hash_t mathutils_array_hash(const float *float_array, size_t array_len);
 int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject *mat);
 
 #ifndef MATH_STANDALONE
-/* dynstr as python string utility funcions */
+/* dynstr as python string utility functions */
 PyObject *mathutils_dynstr_to_py(struct DynStr *ds);
 #endif
 

source/blender/python/mathutils/mathutils_Euler.c

@@ -161,7 +161,7 @@ PyDoc_STRVAR(Euler_to_matrix_doc,
 "\n"
 "   Return a matrix representation of the euler.\n"
 "\n"
-"   :return: A 3x3 roation matrix representation of the euler.\n"
+"   :return: A 3x3 rotation matrix representation of the euler.\n"
 "   :rtype: :class:`Matrix`\n"
 );
 static PyObject *Euler_to_matrix(EulerObject *self)

source/blender/python/mathutils/mathutils_Matrix.c

@@ -2745,7 +2745,7 @@ static int Matrix_translation_set(MatrixObject *self, PyObject *value, void *UNU
 }
 
 PyDoc_STRVAR(Matrix_row_doc,
-"Access the matix by rows (default), (read-only).\n\n:type: Matrix Access"
+"Access the matrix by rows (default), (read-only).\n\n:type: Matrix Access"
 );
 static PyObject *Matrix_row_get(MatrixObject *self, void *UNUSED(closure))
 {
@@ -2753,7 +2753,7 @@ static PyObject *Matrix_row_get(MatrixObject *self, void *UNUSED(closure))
 }
 
 PyDoc_STRVAR(Matrix_col_doc,
-"Access the matix by colums, 3x3 and 4x4 only, (read-only).\n\n:type: Matrix Access"
+"Access the matrix by columns, 3x3 and 4x4 only, (read-only).\n\n:type: Matrix Access"
 );
 static PyObject *Matrix_col_get(MatrixObject *self, void *UNUSED(closure))
 {
@@ -2923,7 +2923,7 @@ PyDoc_STRVAR(matrix_doc,
 "   matrices from 2x2 up to 4x4.\n"
 "\n"
 "   :param rows: Sequence of rows.\n"
-"      When ommitted, a 4x4 identity matrix is constructed.\n"
+"      When omitted, a 4x4 identity matrix is constructed.\n"
 "   :type rows: 2d number sequence\n"
 );
 PyTypeObject matrix_Type = {

source/blender/python/mathutils/mathutils_bvhtree.c

@@ -579,7 +579,7 @@ PyDoc_STRVAR(py_bvhtree_overlap_doc,
 "\n"
 "   Find overlapping indices between 2 trees.\n"
 "\n"
-"   :arg other_tree: Other tree to preform overlap test on.\n"
+"   :arg other_tree: Other tree to perform overlap test on.\n"
 "   :type other_tree: :class:`BVHTree`\n"
 "   :return: Returns a list of unique index pairs,"
 "      the first index referencing this tree, the second referencing the **other_tree**.\n"