Merge branch 'master' into blender2.8

2018-08-31 14:25:42 +10:00
parent 7c6136b35c 98800aa4e0
commit 39ee0f01e3
4 changed files with 72 additions and 0 deletions
--- 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);