diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /source/blender/python | |
parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_ops_call.c | 2 | ||||
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.c | 4 | ||||
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.c | 2 | ||||
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_operator.c | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils.c | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils.h | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils_Euler.c | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils_Matrix.c | 6 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils_bvhtree.c | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index 74d899ba3f8..b523d1d879d 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -542,7 +542,7 @@ static int bpy_slot_from_py( } /** - * Use for getting return values from an operator thats already executed. + * Use for getting return values from an operator that's already executed. * * \note Don't throw any exceptions and should always return a valid (PyObject *). */ diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 394adb1dd3b..fb836ffcce5 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -2457,7 +2457,7 @@ PyDoc_STRVAR(bpy_bmelemseq_index_update_doc, " .. note::\n" "\n" " Running this on sequences besides :class:`BMesh.verts`, :class:`BMesh.edges`, :class:`BMesh.faces`\n" -" works but wont result in each element having a valid index, insted its order in the sequence will be set.\n" +" works but won't result in each element having a valid index, insted its order in the sequence will be set.\n" ); static PyObject *bpy_bmelemseq_index_update(BPy_BMElemSeq *self) { @@ -4054,7 +4054,7 @@ int BPy_BMElem_CheckHType(PyTypeObject *type, const char htype) /** * Use for error strings only, not thread safe, * - * \return a sting like '(BMVert/BMEdge/BMFace/BMLoop)' + * \return a string like '(BMVert/BMEdge/BMFace/BMLoop)' */ char *BPy_BMElem_StringFromHType_ex(const char htype, char ret[32]) { diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 62981798b1a..b1d556e358d 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -388,7 +388,7 @@ PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *data) * This type could eventually be used to access lattice weights. * * \note: Many of blender-api's dict-like-wrappers act like ordered dicts, - * This is intentional _not_ ordered, the weights can be in any order and it wont matter, + * This is intentionally _not_ ordered, the weights can be in any order and it won't matter, * the order should not be used in the api in any meaningful way (as with a python dict) * only expose as mapping, not a sequence. */ diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index ca34de219b8..701dd5fbc19 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -438,7 +438,7 @@ PyDoc_STRVAR(bpy_bm_utils_face_split_doc, " :type vert_a: :class:`bmesh.types.BMVert`\n" " :arg vert_b: Second vertex to cut in the face (face must contain the vert).\n" " :type vert_b: :class:`bmesh.types.BMVert`\n" -" :arg coords: Optional argument to define points inbetween *vert_a* and *vert_b*.\n" +" :arg coords: Optional argument to define points in between *vert_a* and *vert_b*.\n" " :type coords: sequence of float triplets\n" " :arg use_exist: .Use an existing edge if it exists (Only used when *coords* argument is empty or omitted)\n" " :type use_exist: boolean\n" diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 4652da2018c..4183970c9a1 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -124,7 +124,7 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args) CTX_py_dict_set(C, (void *)context_dict); Py_XINCREF(context_dict); /* so we done loose it */ - /* main purpose of thsi function */ + /* main purpose of this function */ ret = WM_operator_poll_context((bContext *)C, ot, context) ? Py_True : Py_False; /* restore with original context dict, probably NULL but need this for nested operator calls */ diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index 0c365ad192c..a3a4e7f313b 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/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 */ diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index 31ad75b3906..ab78009ff89 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/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 diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c index 8be3de42226..31576c32497 100644 --- a/source/blender/python/mathutils/mathutils_Euler.c +++ b/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) diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 6f4ff3216e7..de8deca35a1 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/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 = { diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index 4119917a33f..362fbd65463 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/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" |