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/bmesh/bmesh_py_types_meshdata.c | |
| 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/bmesh/bmesh_py_types_meshdata.c')
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
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. */ |