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

Merge branch 'blender-v2.90-release' into master

Browse Source
This commit is contained in:
Campbell Barton
2020-08-06 19:20:32 +10:00
parent 8a8c3e0972 82150f5641
commit 3439cbcc69
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,7 +383,7 @@ void PyC_StackSpit(void)
}
}
void PyC_StackPrint(FILE *fp)
void PyC_StackPrint(/* FILE */ void *fp)
{
PyThreadState *tstate = PyGILState_GetThisThreadState();
if (tstate != NULL && tstate->frame != NULL) {

2
source/blender/python/generic/py_capi_utils.h
View File

@@ -28,7 +28,7 @@ void PyC_ObSpit(const char *name, PyObject *var);
void PyC_ObSpitStr(char *result, size_t result_len, PyObject *var);
void PyC_LineSpit(void);
void PyC_StackSpit(void);
void PyC_StackPrint(FILE *fp);
void PyC_StackPrint(/* FILE */ void *fp);
PyObject *PyC_ExceptionBuffer(void);
PyObject *PyC_ExceptionBuffer_Simple(void);
PyObject *PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...);