diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 10:08:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 10:08:58 +0300 |
commit | 76d67b4db431591ddf18b131c462bd857950f254 (patch) | |
tree | 2b3d5cb4c97b70812f92bdde2ca52b197504de13 /source/blender/python/intern | |
parent | 1c2358224f400bc503be116dbddd9312c1b1c914 (diff) | |
parent | 44f719b63238503ef8f933f55383c6d4798995cc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/intern')
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/gpu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 3ba024de7c2..94af148da85 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -538,7 +538,7 @@ static bool python_script_exec( if (py_dict) { #ifdef PYMODULE_CLEAR_WORKAROUND PyModuleObject *mmod = (PyModuleObject *)PyDict_GetItem( - PyThreadState_GET()->interp->modules, bpy_intern_str___main__); + PyImport_GetModuleDict(), bpy_intern_str___main__); PyObject *dict_back = mmod->md_dict; /* freeing the module will clear the namespace, * gives problems running classes defined in this namespace being used later. */ diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c index eb28e4d4e1c..71143585657 100644 --- a/source/blender/python/intern/gpu.c +++ b/source/blender/python/intern/gpu.c @@ -85,7 +85,7 @@ PyObject *GPU_initPython(void) { PyObject *module; PyObject *submodule; - PyObject *sys_modules = PyThreadState_GET()->interp->modules; + PyObject *sys_modules = PyImport_GetModuleDict(); module = PyInit_gpu(); |