diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 07:25:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 07:25:42 +0300 |
commit | 39ee0f01e3b340e9c39c9d95df6acdba27694337 (patch) | |
tree | 2b195359ab17302b538bcaf0f61f9d8cde19b2e6 /source/blender/python/generic/py_capi_utils.h | |
parent | 7c6136b35ca18da5a36b6030ade3b45dc5cb483d (diff) | |
parent | 98800aa4e0f7b4aa169e799e804b1ba658be6e69 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/generic/py_capi_utils.h')
-rw-r--r-- | source/blender/python/generic/py_capi_utils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h index fef9171b4d4..b962f40c180 100644 --- a/source/blender/python/generic/py_capi_utils.h +++ b/source/blender/python/generic/py_capi_utils.h @@ -102,6 +102,7 @@ int PyC_FlagSet_ToBitfield(PyC_FlagSet *items, PyObject *value, int *r_val PyObject *PyC_FlagSet_FromBitfield(PyC_FlagSet *items, int flag); bool PyC_RunString_AsNumber(const char *expr, const char *filename, double *r_value); +bool PyC_RunString_AsIntPtr(const char *expr, const char *filename, intptr_t *r_value); bool PyC_RunString_AsString(const char *expr, const char *filename, char **r_value); int PyC_ParseBool(PyObject *o, void *p); |