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_customdata.c | |
| parent | 64c7cf203627d5fc02c03e2a74de197ded36e129 (diff) | |
| parent | 46cf33bf0146946ed05756a9b8bfa1318538f020 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/bmesh/bmesh_py_types_customdata.c')
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_customdata.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index 532f85f87d7..e2241ade7f0 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -43,6 +43,7 @@ #include "../mathutils/mathutils.h" #include "../generic/python_utildefines.h" +#include "../generic/py_capi_utils.h" #include "BKE_customdata.h" @@ -1070,9 +1071,9 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj case CD_PROP_INT: case CD_FACEMAP: { - int tmp_val = PyLong_AsLong(py_value); + int tmp_val = PyC_Long_AsI32(py_value); if (UNLIKELY(tmp_val == -1 && PyErr_Occurred())) { - PyErr_Format(PyExc_TypeError, "expected an int, not a %.200s", Py_TYPE(py_value)->tp_name); + /* error is set */ ret = -1; } else { |