griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-09-19 18:19:49 +02:00
parent a7d43eb1c6 a4f2ebc78d
commit 6b433f4eb3
92 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/generic/idprop_py_api.c
View File

@@ -944,7 +944,7 @@ PyObject *BPy_Wrap_GetKeys(IDProperty *prop)
/* pass */
}
if (i != prop->len) { /* if the loop didnt finish, we know the length is wrong */
if (i != prop->len) { /* if the loop didn't finish, we know the length is wrong */
BPy_IDGroup_CorrectListLen(prop, list, i, __func__);
Py_DECREF(list); /*free the list*/
/*call self again*/

4
source/blender/python/generic/py_capi_utils.c
View File

@@ -618,7 +618,7 @@ const char *PyC_UnicodeAsByteAndSize(PyObject *py_str, Py_ssize_t *size, PyObjec
if (result) {
/* 99% of the time this is enough but we better support non unicode
* chars since blender doesnt limit this */
* chars since blender doesn't limit this */
return result;
}
else {
@@ -671,7 +671,7 @@ PyObject *PyC_UnicodeFromByteAndSize(const char *str, Py_ssize_t size)
PyObject *result = PyUnicode_FromStringAndSize(str, size);
if (result) {
/* 99% of the time this is enough but we better support non unicode
* chars since blender doesnt limit this */
* chars since blender doesn't limit this */
return result;
}
else {