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

Minor changes needed for standalone mathutils

Browse Source
This commit is contained in:
Campbell Barton
2015-12-07 11:07:26 +11:00
parent a048d5f945
commit 41a2b97c30
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/blender/python/generic/py_capi_utils.c
View File

@@ -38,8 +38,10 @@
#include "python_utildefines.h"
#ifndef MATH_STANDALONE
/* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */
#include "BLI_string_utf8.h"
#endif
#ifdef _WIN32
#include "BLI_path_util.h" /* BLI_setenv() */
@@ -199,6 +201,27 @@ void PyC_List_Fill(PyObject *list, PyObject *value)
}
}
/**
* Use with PyArg_ParseTuple's "O&" formatting.
*/
int PyC_ParseBool(PyObject *o, void *p)
{
bool *bool_p = p;
long value;
if (((value = PyLong_AsLong(o)) == -1) || !ELEM(value, 0, 1)) {
PyErr_Format(PyExc_ValueError,
"expected a bool or int (0/1), got %s",
Py_TYPE(o)->tp_name);
return 0;
}
*bool_p = value ? true : false;
return 1;
}
#ifndef MATH_STANDALONE
/* for debugging */
void PyC_ObSpit(const char *name, PyObject *var)
{
@@ -1016,20 +1039,4 @@ int PyC_RunString_AsNumber(const char *expr, double *value, const char *filename
return error_ret;
}
/**
* Use with PyArg_ParseTuple's "O&" formatting.
*/
int PyC_ParseBool(PyObject *o, void *p)
{
bool *bool_p = p;
long value;
if (((value = PyLong_AsLong(o)) == -1) || !ELEM(value, 0, 1)) {
PyErr_Format(PyExc_ValueError,
"expected a bool or int (0/1), got %s",
Py_TYPE(o)->tp_name);
return 0;
}
*bool_p = value ? true : false;
return 1;
}
#endif /* #ifndef MATH_STANDALONE */