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

2020-08-06 19:20:32 +10:00
parent 8a8c3e0972 82150f5641
commit 3439cbcc69
4 changed files with 4 additions and 4 deletions
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -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) {