[Bf-blender-cvs] [14dc1aecf0e] master: Merge branch 'blender-v2.90-release' into master

[Campbell Barton]

Commit: 14dc1aecf0e3dfb4abf8dc1ebfa4494df99b9e01
Author: Campbell Barton
Date:   Thu Aug 6 15:48:42 2020 +1000
Branches: master
https://developer.blender.org/rB14dc1aecf0e3dfb4abf8dc1ebfa4494df99b9e01

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

===================================================================



===================================================================

diff --cc source/blender/python/generic/py_capi_utils.c
index a5b0e244fde,0a4f3b5bebd..413e27589fd
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@@ -383,12 -360,20 +383,26 @@@ void PyC_StackSpit(void
    }
  }
  
+ void PyC_StackPrint(FILE *fp)
+ {
+   PyThreadState *tstate = PyGILState_GetThisThreadState();
+   if (tstate != NULL && tstate->frame != NULL) {
+     PyFrameObject *frame = tstate->frame;
+     do {
+       const int line = PyCode_Addr2Line(frame->f_code, frame->f_lasti);
+       const char *filename = _PyUnicode_AsString(frame->f_code->co_filename);
+       const char *funcname = _PyUnicode_AsString(frame->f_code->co_name);
+       fprintf(fp, "  File \"%s\", line %d in %s\n", filename, line, funcname);
+     } while ((frame = frame->f_back));
+   }
+ }
+ 
 +/** \} */
 +
 +/* -------------------------------------------------------------------- */
 +/** \name Access Current Frame File Name & Line Number
 + * \{ */
 +
  void PyC_FileAndNum(const char **r_filename, int *r_lineno)
  {
    PyFrameObject *frame;