Fix error in recent bpy_interface.c split (missed moving define)
Error in 7341ceb674
, this missed moving a local-define when splitting.
This commit is contained in:
parent
6b5582c7f7
commit
3d47da9e4c
|
@ -444,18 +444,6 @@ void BPY_python_backtrace(FILE *fp)
|
|||
}
|
||||
}
|
||||
|
||||
/* super annoying, undo _PyModule_Clear(), bug [#23871] */
|
||||
#define PYMODULE_CLEAR_WORKAROUND
|
||||
|
||||
#ifdef PYMODULE_CLEAR_WORKAROUND
|
||||
/* bad!, we should never do this, but currently only safe way I could find to keep namespace.
|
||||
* from being cleared. - campbell */
|
||||
typedef struct {
|
||||
PyObject_HEAD PyObject *md_dict;
|
||||
/* omit other values, we only want the dict. */
|
||||
} PyModuleObject;
|
||||
#endif
|
||||
|
||||
void BPY_DECREF(void *pyob_ptr)
|
||||
{
|
||||
PyGILState_STATE gilstate = PyGILState_Ensure();
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include "BPY_extern_run.h"
|
||||
|
||||
#include "bpy_capi_utils.h"
|
||||
#include "bpy_intern_string.h"
|
||||
#include "bpy_traceback.h"
|
||||
|
||||
#include "../generic/py_capi_utils.h"
|
||||
|
@ -65,6 +66,18 @@ static void bpy_text_filename_get(char *fn, const Main *bmain, size_t fn_len, co
|
|||
BLI_snprintf(fn, fn_len, "%s%c%s", ID_BLEND_PATH(bmain, &text->id), SEP, text->id.name + 2);
|
||||
}
|
||||
|
||||
/* Very annoying! Undo #_PyModule_Clear(), see T23871. */
|
||||
#define PYMODULE_CLEAR_WORKAROUND
|
||||
|
||||
#ifdef PYMODULE_CLEAR_WORKAROUND
|
||||
/* bad!, we should never do this, but currently only safe way I could find to keep namespace.
|
||||
* from being cleared. - campbell */
|
||||
typedef struct {
|
||||
PyObject_HEAD PyObject *md_dict;
|
||||
/* omit other values, we only want the dict. */
|
||||
} PyModuleObject;
|
||||
#endif
|
||||
|
||||
static bool python_script_exec(
|
||||
bContext *C, const char *fn, struct Text *text, struct ReportList *reports, const bool do_jump)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue