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/intern/bpy_interface.c
+++ b/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);