Merge branch 'master' into blender2.8

2018-09-13 17:08:58 +10:00
parent 1c2358224f 44f719b632
commit 76d67b4db4
6 changed files with 6 additions and 6 deletions
--- 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. */