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/BPY_extern.h
+++ b/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 */