diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-20 08:50:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-20 08:50:15 +0300 |
| commit | 74974881491d0a8140de5f67421b04a6584ca3d8 (patch) | |
| tree | 48415c6929cb179fc303e4619bc5f231c544d268 /source/blender/python/bmesh/bmesh_py_types_meshdata.c | |
| parent | 64c7cf203627d5fc02c03e2a74de197ded36e129 (diff) | |
| parent | 46cf33bf0146946ed05756a9b8bfa1318538f020 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/bmesh/bmesh_py_types_meshdata.c')
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index f6926e8437d..574aef3d54f 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -45,6 +45,7 @@ #include "bmesh_py_types_meshdata.h" +#include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" /* Mesh Loop UV @@ -98,7 +99,7 @@ static int bpy_bmloopuv_flag_set(BPy_BMLoopUV *self, PyObject *value, void *flag { const int flag = GET_INT_FROM_POINTER(flag_p); - switch (PyLong_AsLong(value)) { + switch (PyC_Long_AsBool(value)) { case true: self->data->flag |= flag; return 0; @@ -106,8 +107,7 @@ static int bpy_bmloopuv_flag_set(BPy_BMLoopUV *self, PyObject *value, void *flag self->data->flag &= ~flag; return 0; default: - PyErr_SetString(PyExc_TypeError, - "expected a boolean type 0/1"); + /* error is set */ return -1; } } @@ -207,7 +207,7 @@ static int bpy_bmvertskin_flag_set(BPy_BMVertSkin *self, PyObject *value, void * { const int flag = GET_INT_FROM_POINTER(flag_p); - switch (PyLong_AsLong(value)) { + switch (PyC_Long_AsBool(value)) { case true: self->data->flag |= flag; return 0; @@ -215,8 +215,7 @@ static int bpy_bmvertskin_flag_set(BPy_BMVertSkin *self, PyObject *value, void * self->data->flag &= ~flag; return 0; default: - PyErr_SetString(PyExc_TypeError, - "expected a boolean type 0/1"); + /* error is set */ return -1; } } |