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

source/blender/python/BPY_extern.h

@@ -55,7 +55,7 @@ void BPY_python_start(int argc, const char **argv);
 void BPY_python_end(void);
 void BPY_python_reset(struct bContext *C);
 void BPY_python_use_system_env(void);
-void BPY_python_backtrace(FILE *file);
+void BPY_python_backtrace(/* FILE */ void *file);
 
 /* global interpreter lock */
 

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) {

source/blender/python/generic/py_capi_utils.h

@@ -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, ...);

source/blender/python/intern/bpy_interface.c

@@ -438,7 +438,7 @@ static void python_script_error_jump_text(struct Text *text)
   }
 }
 
-void BPY_python_backtrace(FILE *fp)
+void BPY_python_backtrace(/* FILE */ void *fp)
 {
   fputs("\n# Python backtrace\n", fp);
   PyC_StackPrint(fp);