Merge branch 'master' into blender2.8

2018-07-01 16:22:06 +02:00
parent bc95c7a3ea ddee0931b8
commit 36a9436d80
69 changed files with 444 additions and 365 deletions
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -91,7 +91,7 @@ int PyC_AsArray_FAST(
 		}
 	}
 	else if (type == &PyBool_Type) {
-		int *array_bool = array;
+		bool *array_bool = array;
 		for (i = 0; i < length; i++) {
 			array_bool[i] = (PyLong_AsLong(value_fast_items[i]) != 0);
 		}