archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Philipp Oeser
2018-07-16 15:16:00 +02:00
parent de2f1c64fe 43f0af734e
commit 77d70c7f1d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/python/intern/bpy_rna.c
View File

@@ -5118,6 +5118,9 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set)
case PROP_RAW_DOUBLE: case PROP_RAW_DOUBLE:
item = PyFloat_FromDouble((double) ((double *)array)[i]); item = PyFloat_FromDouble((double) ((double *)array)[i]);
break; break;
case PROP_RAW_BOOLEAN:
item = PyBool_FromLong((long) ((bool *)array)[i]);
break;
default: /* PROP_RAW_UNSET */ default: /* PROP_RAW_UNSET */
/* should never happen */ /* should never happen */
BLI_assert(!"Invalid array type - get"); BLI_assert(!"Invalid array type - get");

3
source/blender/python/mathutils/mathutils_Quaternion.c
View File

@@ -1100,7 +1100,8 @@ static PyObject *Quaternion_new(PyTypeObject *type, PyObject *args, PyObject *kw
{ {
PyObject *seq = NULL; PyObject *seq = NULL;
double angle = 0.0f; double angle = 0.0f;
float quat[QUAT_SIZE] = {0.0f, 0.0f, 0.0f, 0.0f}; float quat[QUAT_SIZE];
unit_qt(quat);
if (kwds && PyDict_Size(kwds)) { if (kwds && PyDict_Size(kwds)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,